From 63907dbbaf1dabcb8bbc084d4d55f669623ae7b7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Sep 2006 20:08:01 +0000 Subject: [PATCH] From Bryan Thrall, fix to Optimizer::MergeGeometryVisitor so that it checks the permissable operation status on Drawables. --- src/osgUtil/Optimizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 59529a520..19263d158 100644 --- 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); }