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

From Tony Horrobin, "This fix just makes a couple of calls to ref_ptr<>::get() to satisfy the compiler.

Browse Source 
The changes make the build successful under Windows 7/VC2005 and Ubuntu 9.10 with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF.
"
This commit is contained in:
Robert Osfield
2010-01-26 16:30:48 +00:00
parent 865eb1df2f
commit 6a30b04dd9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/Serializer
View File

@@ -845,7 +845,7 @@ protected:
serializer->add(#VALUE, MyClass::VALUE) serializer->add(#VALUE, MyClass::VALUE)
#define END_ENUM_SERIALIZER() \ #define END_ENUM_SERIALIZER() \
wrapper->addSerializer(serializer); } wrapper->addSerializer(serializer.get()); }
} }

4
src/osgWrappers/serializers/osg/StateSet.cpp
View File

@@ -154,7 +154,7 @@ static bool readAttributeList( osgDB::InputStream& is, osg::StateSet& ss )
for ( osg::StateSet::AttributeList::iterator itr=attrs.begin(); for ( osg::StateSet::AttributeList::iterator itr=attrs.begin();
itr!=attrs.end(); ++itr ) itr!=attrs.end(); ++itr )
{ {
ss.setAttribute( itr->second.first, itr->second.second ); ss.setAttribute( itr->second.first.get(), itr->second.second );
} }
return true; return true;
} }
@@ -221,7 +221,7 @@ static bool readTextureAttributeList( osgDB::InputStream& is, osg::StateSet& ss
for ( osg::StateSet::AttributeList::iterator itr=attrs.begin(); for ( osg::StateSet::AttributeList::iterator itr=attrs.begin();
itr!=attrs.end(); ++itr ) itr!=attrs.end(); ++itr )
{ {
ss.setTextureAttribute( i, itr->second.first, itr->second.second ); ss.setTextureAttribute( i, itr->second.first.get(), itr->second.second );
} }
attrs.clear(); attrs.clear();
} }