Changeset 4606 for vtkvis/branches/1.7/Renderer.cpp

Timestamp:

Aug 2, 2014 12:47:55 AM (10 years ago)

Author:

ldelgass

Message:

More merges from trunk, including command-line arg. for file descriptors

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• Renderer.cpp (modified) (1 diff)

vtkvis/branches/1.7/Renderer.cpp

@@ -1558 +1558 @@
         if (axis == X_AXIS) {
             _cubeAxesActor->SetXLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->XAutoLabelFormatOff();
+#endif
         } else if (axis == Y_AXIS) {
             _cubeAxesActor->SetYLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->YAutoLabelFormatOff();
+#endif
         } else if (axis == Z_AXIS) {
             _cubeAxesActor->SetZLabelFormat(format);
+#ifdef USE_CUSTOM_AXES
             _cubeAxesActor->ZAutoLabelFormatOff();
+#endif
         }
         _needsRedraw = true;