Changeset 4219

Timestamp:

Mar 11, 2014 9:02:17 AM (10 years ago)

Author:

ldelgass

Message:

merge r3902 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/Renderer.cpp (modified) (1 diff)

branches/1.3/packages/vizservers/vtkvis/Renderer.cpp

@@ -383 +383 @@
     bool needRangeUpdate = false;
     do {
-        if (strcmp(itr->second->getActiveScalarsName(), scalarName) != 0) {
+        const char *name = itr->second->getActiveScalarsName();
+        if (name == NULL || (strcmp(name, scalarName) != 0)) {
             if (!itr->second->setActiveScalars(scalarName)) {
                 ret = false;