Merge pull request #203 from scrawl/optimizer

MergeGeometryVisitor fix
2017-03-11 11:34:16 +00:00
parent 50649fb2a2 c9621ff17a
commit 1d8efb1a3a
3 changed files with 55 additions and 67 deletions
--- a/include/osgUtil/Optimizer
+++ b/include/osgUtil/Optimizer
@@ -532,10 +532,10 @@ class OSGUTIL_EXPORT Optimizer
                    return _targetMaximumNumberOfVertices;
                }

-                virtual void apply(osg::Geode& geode) { mergeGeode(geode); }
+                virtual void apply(osg::Group& group) { mergeGroup(group); traverse(group); }
                virtual void apply(osg::Billboard&) { /* don't do anything*/ }

-                bool mergeGeode(osg::Geode& geode);
+                bool mergeGroup(osg::Group& group);

                static bool geometryContainsSharedArrays(osg::Geometry& geom);