From 00470acb61de5852e58d5659dc6292afe53d597e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 12 Jul 2002 13:00:09 +0000 Subject: [PATCH] Fix, sent in by Macro Jez, to the set of the camera with the computed near and far plane, so that it is only updated when _computeNearFar != CullVisitor::DO_NOT_COMPUTE_NEAR_FAR. --- src/osgUtil/SceneView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/SceneView.cpp b/src/osgUtil/SceneView.cpp index 150fcc55d..82fd0874a 100644 --- a/src/osgUtil/SceneView.cpp +++ b/src/osgUtil/SceneView.cpp @@ -268,7 +268,7 @@ void SceneView::cull() cullStage(projectionRight.get(),modelviewRight.get(),_cullVisitorRight.get(),_rendergraphRight.get(),_renderStageRight.get()); - if (_camera.valid()) + if (_camera.valid() && _computeNearFar != CullVisitor::DO_NOT_COMPUTE_NEAR_FAR) { // clamp the camera to the near/far computed in cull traversal. _camera->setNearFar(_cullVisitorRight->getCalculatedNearPlane(),_cullVisitorRight->getCalculatedFarPlane()); @@ -296,7 +296,7 @@ void SceneView::cull() _cullVisitor->setTraversalMask(_cullMask); cullStage(projection.get(),modelview.get(),_cullVisitor.get(),_rendergraph.get(),_renderStage.get()); - if (_camera.valid()) + if (_camera.valid() && _computeNearFar != CullVisitor::DO_NOT_COMPUTE_NEAR_FAR) { // clamp the camera to the near/far computed in cull traversal. _camera->setNearFar(_cullVisitor->getCalculatedNearPlane(),_cullVisitor->getCalculatedFarPlane());