From f43d02f4967c86a2981132a6fe57a8e668edb6ca Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 23 Jan 2003 15:12:58 +0000
Subject: [PATCH] Added extra checks in the removal of rendundent nodes code so
 that description fields etc are checked.

---
 src/osgUtil/Optimizer.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp
index 8f33bfe02..fa1516b78 100644
--- a/src/osgUtil/Optimizer.cpp
+++ b/src/osgUtil/Optimizer.cpp
@@ -37,6 +37,18 @@ using namespace osgUtil;
 // Overall Optimizetion function.
 ////////////////////////////////////////////////////////////////////////////
 
+static bool isNodeEmpty(const osg::Node& node)
+{
+    if (node.getUserData()) return false;
+    if (node.getUpdateCallback()) return false;
+    if (node.getCullCallback()) return false;
+    if (node.getNumDescriptions()>0) return false;
+    if (node.getStateSet()) return false;
+    if (node.getNodeMask()!=0xffffffff) return false;
+    return true;
+}
+
+
 void Optimizer::optimize(osg::Node* node, unsigned int options)
 {
 
@@ -849,7 +861,7 @@ void Optimizer::RemoveEmptyNodesVisitor::apply(osg::Geode& geode)
 {
     if (geode.getNumParents()>0)
     {
-        if (geode.getNumDrawables()==0) _redundantNodeList.insert(&geode);
+        if (geode.getNumDrawables()==0 && isNodeEmpty(geode)) _redundantNodeList.insert(&geode);
     }
 }
 
@@ -858,7 +870,7 @@ void Optimizer::RemoveEmptyNodesVisitor::apply(osg::Group& group)
     if (group.getNumParents()>0)
     {
         // only remove empty groups, but not empty occluders.
-        if (group.getNumChildren()==0 && 
+        if (group.getNumChildren()==0 && isNodeEmpty(group) && 
             (typeid(group)==typeid(osg::Group) || dynamic_cast<osg::Transform*>(&group)))
         {
             _redundantNodeList.insert(&group);
@@ -917,10 +929,7 @@ void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Group& group)
         {
             if (group.getNumParents()>0 && group.getNumChildren()<=1)
             {
-                if (!group.getUserData() &&
-                    !group.getUpdateCallback() &&
-                    !group.getStateSet() &&
-                    group.getNodeMask()==0xffffffff)
+                if (isNodeEmpty(group))
                 {
                     _redundantNodeList.insert(&group);
                 }