Changeset 13041 for OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp
r12725 r13041 119 119 return itr->get(); 120 120 } 121 121 122 122 for ( StringList::const_iterator itr=_associates.begin(); itr!=_associates.end(); ++itr ) 123 123 { … … 130 130 continue; 131 131 } 132 132 133 133 for ( SerializerList::iterator aitr=assocWrapper->_serializers.begin(); 134 134 aitr!=assocWrapper->_serializers.end(); ++aitr ) … … 170 170 (*itr)->objectRead(is, obj); 171 171 } 172 172 173 173 return readOK; 174 174 } … … 205 205 _backupSerializers = _serializers; 206 206 _serializers.clear(); 207 207 208 208 unsigned int size = properties.size(); 209 209 unsigned int serializersSize = _backupSerializers.size(); … … 216 216 break; 217 217 } 218 218 219 219 const std::string& prop = properties[i]; 220 220 if ( prop==_backupSerializers[i]->getName() ) … … 249 249 properties.push_back( (*itr)->getName() ); 250 250 } 251 251 252 252 for ( std::vector<int>::iterator itr=_typeList.begin(); 253 253 itr!=_typeList.end(); ++itr ) … … 415 415 glTable.add( "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG",GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG ); 416 416 glTable.add( "GL_ETC1_RGB8_OES",GL_ETC1_RGB8_OES ); 417 417 418 418 // Texture source types 419 419 glTable.add( "GL_BYTE", GL_BYTE );
