From 20e5751a4ab8901b58ba58197c31e9b5cf8d7366 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 19 Oct 2001 15:30:54 +0000 Subject: [PATCH] Updated the osgUtil::Optimize so that the call to Optimize::StateVisitor is #ifdef out under Win32 and STL port isn't being used. This prevents crashes due to MS's flacky STL implementation. --- src/osgUtil/Optimizer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/osgUtil/Optimizer.cpp b/src/osgUtil/Optimizer.cpp index c96d196a7..cd99d33e8 100644 --- a/src/osgUtil/Optimizer.cpp +++ b/src/osgUtil/Optimizer.cpp @@ -41,12 +41,11 @@ void Optimizer::optimize(osg::Node* node, unsigned int options) if (options & SHARE_DUPLICATE_STATE) { - #ifndef WIN32 - // optimize the state in scene graph, removing duplicate state. - #endif + #if !defined(WIN32) || defined(_STLPORT_VERSION) StateVisitor osv; node->accept(osv); osv.optimize(); + #endif } }