Fixed handling of NULL entries in osg::Geometry TexCoordArrayList and VertexAttribArrayList.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14715 16af8721-9629-0410-8352-f15c8da7e697
2015-02-25 14:55:59 +00:00
parent 213efd20ad
commit e7d41377be
3 changed files with 17 additions and 3 deletions
--- a/src/osgDB/InputStream.cpp
+++ b/src/osgDB/InputStream.cpp
@@ -815,7 +815,14 @@ osg::Object* InputStream::readObject( osg::Object* existingObj )
 {
    std::string className;
    unsigned int id = 0;
-    *this >> className >> BEGIN_BRACKET >> PROPERTY("UniqueID") >> id;
+    *this >> className;
+
+    if (className=="NULL")
+    {
+        return 0;
+    }
+
+    *this >> BEGIN_BRACKET >> PROPERTY("UniqueID") >> id;
    if ( getException() ) return NULL;

    IdentifierMap::iterator itr = _identifierMap.find( id );