Ignore:
Timestamp:
Aug 2, 2014 12:47:55 AM (8 years ago)
Author:
ldelgass
Message:

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

Location:
vtkvis/branches/1.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • vtkvis/branches/1.7

  • vtkvis/branches/1.7/Renderer.cpp

    r4604 r4606  
    15581558        if (axis == X_AXIS) {
    15591559            _cubeAxesActor->SetXLabelFormat(format);
     1560#ifdef USE_CUSTOM_AXES
    15601561            _cubeAxesActor->XAutoLabelFormatOff();
     1562#endif
    15611563        } else if (axis == Y_AXIS) {
    15621564            _cubeAxesActor->SetYLabelFormat(format);
     1565#ifdef USE_CUSTOM_AXES
    15631566            _cubeAxesActor->YAutoLabelFormatOff();
     1567#endif
    15641568        } else if (axis == Z_AXIS) {
    15651569            _cubeAxesActor->SetZLabelFormat(format);
     1570#ifdef USE_CUSTOM_AXES
    15661571            _cubeAxesActor->ZAutoLabelFormatOff();
     1572#endif
    15671573        }
    15681574        _needsRedraw = true;
Note: See TracChangeset for help on using the changeset viewer.