Changeset 5474 for nanovis/branches

Timestamp:

May 7, 2015, 7:43:36 PM (10 years ago)

Author:

ldelgass

Message:

minor merge in nanovis 1.2 branch

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (1 diff)
• VtkDataSetReader.cpp (modified) (1 diff)

nanovis/branches/1.2/Makefile.in

@@ -67 +67 @@
                 -lvtkCommonCore-$(VTK_VERSION) \
                 -lvtkCommonDataModel-$(VTK_VERSION) \
-                -lvtkCommonExecutionModel-$(VTK_VERSION)  \
-                -lvtkCommonMisc-$(VTK_VERSION)  \
+                -lvtkCommonExecutionModel-$(VTK_VERSION) \
+                -lvtkCommonMisc-$(VTK_VERSION) \
                 -lvtkCommonSystem-$(VTK_VERSION) \
                 -lvtkCommonTransforms-$(VTK_VERSION) \

nanovis/branches/1.2/VtkDataSetReader.cpp

@@ -48 +48 @@
             reader->ReadAllVectorsOn();
             //reader->ReadAllTensorsOn();
-            //reader->ReadAllFieldsOn();
+            reader->ReadAllFieldsOn();
             reader->SetLookupTableName("");
             reader->Update();