FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added const to LessGeometry functor to fix Win32 build.

Browse Source
This commit is contained in:
Robert Osfield
2002-07-18 09:17:50 +00:00
parent 3ec32aab82
commit 1a139efbbc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgUtil/Optimizer
View File

@@ -326,7 +326,7 @@ class OSGUTIL_EXPORT Optimizer
MergeGeometryVisitor() : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) {}
virtual void apply(osg::Geode& geode) { mergeGeode(geode); }
virtual void apply(osg::Billboard& billboard) { /* don't do anything*/ }
virtual void apply(osg::Billboard&) { /* don't do anything*/ }
static bool mergeGeode(osg::Geode& geode);
static bool mergeGeometry(osg::Geometry& lhs,osg::Geometry& rhs);

2
src/osgUtil/Optimizer.cpp
View File

@@ -1170,7 +1170,7 @@ void Optimizer::CombineLODsVisitor::combineLODs()
struct LessGeometry
{
bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs)
bool operator() (const osg::Geometry* lhs,const osg::Geometry* rhs) const
{
if (lhs->getStateSet()<rhs->getStateSet()) return true;
if (rhs->getStateSet()<lhs->getStateSet()) return false;