Changeset 10480 for OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

Timestamp:

07/16/09 13:06:31 (4 years ago)

Author:

robert

Message:

From Colin MacDonald?,"The Optimizer Merge Geometry visitor is always merging geometries,
even if they have had DataVariance? DYNAMIC explicitly specified. Then
when an application attempts to dynamically update the geometry in the
frame loop the primitive sets and data arrays are no longer as
expected, leading to display and/or memory corruption.

Attached is a simple fix. "

Note from Robert Osfield, tweaked Colin's changes to that it use != DYNAMIC as the the test rather than == STATIC.

Files:

• OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -1842 +1842 @@
                 //geom->computeCorrectBindingsAndArraySizes();
 
-                if (!geometryContainsSharedArrays(*geom) && isOperationPermissibleForObject(geom))
+                if (!geometryContainsSharedArrays(*geom) &&
+                      geom->getDataVariance()!=osg::Object::DYNAMIC &&
+                      isOperationPermissibleForObject(geom))
                 {
                     geometryDuplicateMap[geom].push_back(geom);