From a6939bc46f5c1de5bf871a42bad9d4e22ab41a41 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 16 Jun 2014 16:18:02 +0000 Subject: [PATCH] Fixed check against number of vertices git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14263 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgUtil/Optimizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index 149ac5a04..e6b725afd 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -2003,10 +2003,10 @@ bool Optimizer::MergeGeometryVisitor::mergeGeode(osg::Geode& geode) unsigned int numVertices(duplicateList.front()->getVertexArray() ? duplicateList.front()->getVertexArray()->getNumElements() : 0); DuplicateList::iterator eachGeom(duplicateList.begin()+1); // until all geometries have been checked or _targetMaximumNumberOfVertices is reached - for (;eachGeom!=duplicateList.end(); ++eachGeom) + for(;eachGeom!=duplicateList.end(); ++eachGeom) { unsigned int numAddVertices((*eachGeom)->getVertexArray() ? (*eachGeom)->getVertexArray()->getNumElements() : 0); - if (numVertices+numAddVertices<_targetMaximumNumberOfVertices) + if ((numVertices+numAddVertices)>_targetMaximumNumberOfVertices) { break; }