Changeset 13430

Show
Ignore:
Timestamp:
11/26/14 21:40:57 (15 hours ago)
Author:
robert
Message:

From Jason Beverage, "It looks like the Callback header got accidentally removed from the CMakeLists.txt in the submission yesterday for the geometry instancing example."

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

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r13429 r13430  
    913913    if (_views.empty()) return; 
    914914 
    915 #if 1 
    916915    double cutOffTime = _frameStamp->getReferenceTime(); 
    917 #else     
    918     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    919 #endif 
    920916 
    921917    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); 
  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r13429 r13430  
    827827    if (_done) return; 
    828828 
    829 #if 1 
    830829    double cutOffTime = _frameStamp->getReferenceTime(); 
    831 #else     
    832     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    833 #endif 
    834830     
    835831    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick());