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

Build fix for when ref_ptr<> auto conversion is disabled

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14565 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-04 15:10:43 +00:00
parent 5efe60dcf5
commit f8d53b7c8d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgDB/DatabasePager.cpp
View File

@@ -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)
{

8
src/osgUtil/IncrementalCompileOperation.cpp
View File

@@ -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<osg::Program*>(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)
{