From Bryan Thrall, fix to Optimizer::MergeGeometryVisitor so that it checks

the permissable operation status on Drawables.
2006-09-08 20:08:01 +00:00
parent db33ae97eb
commit 63907dbbaf
1 changed files with 1 additions and 1 deletions
--- a/src/osgUtil/Optimizer.cpp
+++ b/src/osgUtil/Optimizer.cpp
@@ -1749,7 +1749,7 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode)
            {
                //geom->computeCorrectBindingsAndArraySizes();

-                if (!geometryContainsSharedArrays(*geom))
+                if (!geometryContainsSharedArrays(*geom) && isOperationPermissibleForObject(geom))
                {
                    geometryDuplicateMap[geom].push_back(geom);
                }