Changeset 12046 for OpenSceneGraph/trunk/examples/osganimationmorph/osganimationmorph.cpp

Timestamp:

12/20/10 13:02:50 (2 years ago)

Author:

robert

Message:

From Kim Seokhwan, "Error fix in example/osganimationmorph/osganimationmorph.cpp

in this file,
function,
osg::Geometry* getShape(const std::string& name)
(line 51)

tries to use null pointer when model is not provided.
I added simple comment in attached file."

Files:

• OpenSceneGraph/trunk/examples/osganimationmorph/osganimationmorph.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osganimationmorph/osganimationmorph.cpp

@@ -53 +53 @@
     osg::Node* shape0 = osgDB::readNodeFile(name);
     GeometryFinder finder;
+    /*
     shape0->accept(finder);
     return finder._geom.get();
+    */
+    //is changed to
+    if (shape0)
+    {
+        shape0->accept(finder);
+        return finder._geom.get();
+    }
+    else
+    {
+        return NULL;
+    }
 }