From 23bc6c2fe55d5bb8940388a0e95c50344ab48181 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 4 Mar 2008 16:03:37 +0000
Subject: [PATCH] Refactored the way that the camera settings are inhertied

---
 src/osgUtil/CullVisitor.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp
index 82039b964..ca58a9f27 100644
--- a/src/osgUtil/CullVisitor.cpp
+++ b/src/osgUtil/CullVisitor.cpp
@@ -1155,8 +1155,16 @@ void CullVisitor::apply(osg::Camera& camera)
     // Save current cull settings
     CullSettings saved_cull_settings(*this);
 
+#if 1
+    // set cull settings from this Camera
+    setCullSettings(camera);
+
+    // inherit the settings from above
+    inheritCullSettings(saved_cull_settings, camera.getInheritanceMask());
+#else
     // activate all active cull settings from this Camera
     inheritCullSettings(camera);
+#endif
 
     // set the cull mask.
     unsigned int savedTraversalMask = getTraversalMask();