- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/Object.cpp
r12511 r13041 15 15 { 16 16 is >> osgDB::BEGIN_BRACKET; 17 osg::Object* object = is.readObject(); 18 if(object) obj.setUserData(object); 17 osg::Object* object = is.readObject(); 18 if(object) obj.setUserData(object); 19 19 is >> osgDB::END_BRACKET; 20 20 return true; … … 24 24 { 25 25 os << osgDB::BEGIN_BRACKET << std::endl; 26 os.writeObject(dynamic_cast<const osg::Object*>(obj.getUserData())); 26 os.writeObject(dynamic_cast<const osg::Object*>(obj.getUserData())); 27 27 os << osgDB::END_BRACKET << std::endl; 28 28 return true; … … 35 35 { 36 36 ADD_STRING_SERIALIZER( Name, "" ); // _name 37 37 38 38 BEGIN_ENUM_SERIALIZER( DataVariance, UNSPECIFIED ); 39 39 ADD_ENUM_VALUE( STATIC ); … … 43 43 44 44 ADD_USER_SERIALIZER( UserData ); // _userData, deprecated 45 45 46 46 UPDATE_TO_VERSION( 77 ) 47 47 {
