Changeset 4607 for vtkvis/branches/1.7

Timestamp:

Aug 2, 2014, 12:50:48 AM (10 years ago)

Author:

ldelgass

Message:

Merge trivial fix from r4174

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• RendererGraphicsObjs.h (modified) (2 diffs)

vtkvis/branches/1.7/RendererGraphicsObjs.h

@@ -1097 +1097 @@
     for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) {
         if ((!onlyVisible || itr->second->getVisibility()) &&
-            itr->second->getProp() != NULL)
+            itr->second->getProp() != NULL) {
             mergeBounds(bounds, bounds, itr->second->getBounds());
 #ifdef DEBUG
-        double *bPtr = itr->second->getBounds();
-        assert(bPtr != NULL);
-        GO_TRACE(T,
-                 "%s bounds: %g %g %g %g %g %g",
-                 itr->first.c_str(),
-                 bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]);
+            double *bPtr = itr->second->getBounds();
+            assert(bPtr != NULL);
+            GO_TRACE(T,
+                     "%s bounds: %g %g %g %g %g %g",
+                     itr->first.c_str(),
+                     bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]);
 #endif
+        }
     }
 }
@@ -1125 +1126 @@
     for (itr = hashmap.begin(); itr != hashmap.end(); ++itr) {
         if ((!onlyVisible || itr->second->getVisibility()) &&
-            itr->second->getProp() != NULL)
+            itr->second->getProp() != NULL) {
             mergeBounds(bounds, bounds, itr->second->getUnscaledBounds());
 #ifdef DEBUG
-        double *bPtr = itr->second->getUnscaledBounds();
-        assert(bPtr != NULL);
-        GO_TRACE(T,
-                 "%s bounds: %g %g %g %g %g %g",
-                 itr->first.c_str(),
-                 bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]);
+            double *bPtr = itr->second->getUnscaledBounds();
+            assert(bPtr != NULL);
+            GO_TRACE(T,
+                     "%s bounds: %g %g %g %g %g %g",
+                     itr->first.c_str(),
+                     bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]);
 #endif
+        }
     }
 }