From 255f6dda419cb306b3c04115d99d8e0f8cf480d0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 20 Nov 2009 14:40:58 +0000 Subject: [PATCH] Moved the ImagePager update to before the main scene graph update traversal --- src/osgViewer/Scene.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/osgViewer/Scene.cpp b/src/osgViewer/Scene.cpp index 6455f00d2..0b87a7539 100644 --- a/src/osgViewer/Scene.cpp +++ b/src/osgViewer/Scene.cpp @@ -87,18 +87,17 @@ void Scene::updateSceneGraph(osg::NodeVisitor& updateVisitor) getDatabasePager()->updateSceneGraph((*updateVisitor.getFrameStamp())); } - if (getSceneData()) - { - updateVisitor.setImageRequestHandler(getImagePager()); - getSceneData()->accept(updateVisitor); - } - if (getImagePager()) { // synchronize changes required by the DatabasePager thread to the scene graph getImagePager()->updateSceneGraph(*(updateVisitor.getFrameStamp())); } + if (getSceneData()) + { + updateVisitor.setImageRequestHandler(getImagePager()); + getSceneData()->accept(updateVisitor); + } }