Changeset 11196

Timestamp:

03/10/10 17:31:30 (3 years ago)

Author:

robert

Message:

From Roger James, "Here is a small stability fix to the dae reader which seems to have dropped out of the latest version."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dae/daeRGeometry.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dae/daeRGeometry.cpp

@@ -459 +459 @@
 {
     osg::Geometry *geometry = new osg::Geometry();
-    geometry->setName(group->getMaterial());
+    if (NULL != group->getMaterial())
+        geometry->setName(group->getMaterial());
     geode->addDrawable( geometry );
 
@@ -478 +479 @@
 {
     osg::Geometry *geometry = new osg::Geometry();
-    geometry->setName(group->getMaterial());
+    if (NULL != group->getMaterial())
+        geometry->setName(group->getMaterial());
     geode->addDrawable( geometry );
 
@@ -503 +505 @@
 
     osg::Geometry* geometry = new osg::Geometry();
-    geometry->setName(group->getMaterial());
+    if (NULL != group->getMaterial())
+        geometry->setName(group->getMaterial());
     geode->addDrawable(geometry);