FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fix for case when Renderer is assigned to a Camera that has now View

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15141 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-09-25 11:15:04 +00:00
parent e878e53cab
commit ef6f2dbcfd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgViewer/Renderer.cpp
View File

@ -533,10 +533,14 @@ void Renderer::updateSceneView(osgUtil::SceneView* sceneView)
sceneView->getCullVisitor()->setImageRequestHandler(imagePager); sceneView->getCullVisitor()->setImageRequestHandler(imagePager);
if (view->getFrameStamp()) if (view && view->getFrameStamp())
{ {
(*sceneView->getFrameStamp()) = *(view->getFrameStamp()); (*sceneView->getFrameStamp()) = *(view->getFrameStamp());
} }
else if (state->getFrameStamp())
{
(*sceneView->getFrameStamp()) = *(state->getFrameStamp());
}
osg::DisplaySettings* ds = _camera->getDisplaySettings() ? _camera->getDisplaySettings() : osg::DisplaySettings* ds = _camera->getDisplaySettings() ? _camera->getDisplaySettings() :
((view &&view->getDisplaySettings()) ? view->getDisplaySettings() : osg::DisplaySettings::instance().get()); ((view &&view->getDisplaySettings()) ? view->getDisplaySettings() : osg::DisplaySettings::instance().get());