From 6783dcff176f0338ef4e09a8817dc831b921c477 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Jun 2011 09:12:12 +0000 Subject: [PATCH] Fixed regression in --run-on-demand feature --- src/osgViewer/CompositeViewer.cpp | 2 +- src/osgViewer/Viewer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index f86a28b36..d09c4f65c 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -685,7 +685,7 @@ void CompositeViewer::eventTraversal() if (_views.empty()) return; - double cutOffTime = _frameStamp->getReferenceTime(); + double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index 16e83ac7f..36b64a3d7 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -613,7 +613,8 @@ void Viewer::eventTraversal() { if (_done) return; - double cutOffTime = _frameStamp->getReferenceTime(); + double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); + double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); // OSG_NOTICE<<"Viewer::frameEventTraversal()."<