diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 3854df224..24f2dafc5 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -342,7 +342,7 @@ public: virtual void apply(osg::Drawable& drawable) { - if (_kdTreeBuilder.valid() && _markerObject!=drawable.getUserData()) + if (_kdTreeBuilder.valid() && _markerObject.get()!=drawable.getUserData()) { drawable.accept(*_kdTreeBuilder); } @@ -360,7 +360,7 @@ public: { // apply any changes if the texture is not static. if (texture.getDataVariance()!=osg::Object::STATIC && - _markerObject!=texture.getUserData()) + _markerObject.get()!=texture.getUserData()) { if (_changeAutoUnRef) { diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index b2645386a..122cf6d6e 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -77,7 +77,7 @@ void StateToCompile::apply(osg::Drawable& drawable) _drawablesHandled.insert(&drawable); - if (_markerObject!=drawable.getUserData()) + if (_markerObject.get()!=drawable.getUserData()) { if (drawable.getDataVariance()!=osg::Object::STATIC) { @@ -125,10 +125,10 @@ void StateToCompile::apply(osg::StateSet& stateset) _statesetsHandled.insert(&stateset); if ((_mode & GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES)!=0 && - _markerObject!=stateset.getUserData()) + _markerObject.get()!=stateset.getUserData()) { osg::Program* program = dynamic_cast(stateset.getAttribute(osg::StateAttribute::PROGRAM)); - if (program && _markerObject!=program->getUserData()) + if (program && _markerObject.get()!=program->getUserData()) { _programs.insert(program); @@ -166,7 +166,7 @@ void StateToCompile::apply(osg::StateSet& stateset) void StateToCompile::apply(osg::Texture& texture) { // don't make any changes if Texture already processed - if (_markerObject==texture.getUserData()) return; + if (_markerObject.get()==texture.getUserData()) return; if (_assignPBOToImages) {