From Michael Platings, "the build is broken if you have the OSG_REF_PTR_IMPLICIT_OUTPUT_CONVERSION turned off - the attached files fix this."
This commit is contained in:
@@ -116,7 +116,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
|
||||
for ( SerializerList::iterator itr=_serializers.begin(); itr!=_serializers.end(); ++itr )
|
||||
{
|
||||
if ( (*itr)->getName()==name )
|
||||
return *itr;
|
||||
return itr->get();
|
||||
}
|
||||
|
||||
for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr )
|
||||
@@ -134,7 +134,7 @@ BaseSerializer* ObjectWrapper::getSerializer( const std::string& name )
|
||||
aitr!=assocWrapper->_serializers.end(); ++aitr )
|
||||
{
|
||||
if ( (*aitr)->getName()==name )
|
||||
return *aitr;
|
||||
return aitr->get();
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user