Changeset 12596

Show
Ignore:
Timestamp:
06/22/11 11:12:12 (2 years ago)
Author:
robert
Message:

Fixed regression in --run-on-demand feature

Location:
OpenSceneGraph/trunk/src/osgViewer
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r12523 r12596  
    686686    if (_views.empty()) return; 
    687687 
    688     double cutOffTime = _frameStamp->getReferenceTime(); 
     688    double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    689689     
    690690    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); 

  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r12523 r12596  
    614614    if (_done) return; 
    615615 
    616     double cutOffTime = _frameStamp->getReferenceTime(); 
     616    double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
     617     
    617618    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); 
    618619