From 08612666faa5a3788cad83a8363d759b112870c7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 10 Mar 2010 16:31:30 +0000 Subject: [PATCH] From Roger James, "Here is a small stability fix to the dae reader which seems to have dropped out of the latest version." --- src/osgPlugins/dae/daeRGeometry.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/dae/daeRGeometry.cpp b/src/osgPlugins/dae/daeRGeometry.cpp index e26a85932..156be3bcd 100644 --- a/src/osgPlugins/dae/daeRGeometry.cpp +++ b/src/osgPlugins/dae/daeRGeometry.cpp @@ -458,7 +458,8 @@ void daeReader::processSinglePPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap& sources, GLenum mode) { osg::Geometry *geometry = new osg::Geometry(); - geometry->setName(group->getMaterial()); + if (NULL != group->getMaterial()) + geometry->setName(group->getMaterial()); geode->addDrawable( geometry ); osg::DrawElementsUInt* pDrawElements = new osg::DrawElementsUInt(mode); @@ -477,7 +478,8 @@ void daeReader::processMultiPPrimitive(osg::Geode* geode, const domMesh* pDomMesh, const T* group, SourceMap &sources, GLenum mode) { osg::Geometry *geometry = new osg::Geometry(); - geometry->setName(group->getMaterial()); + if (NULL != group->getMaterial()) + geometry->setName(group->getMaterial()); geode->addDrawable( geometry ); std::vector > indexLists; @@ -502,7 +504,8 @@ void daeReader::processPolylist(osg::Geode* geode, const domMesh* pDomMesh, cons } osg::Geometry* geometry = new osg::Geometry(); - geometry->setName(group->getMaterial()); + if (NULL != group->getMaterial()) + geometry->setName(group->getMaterial()); geode->addDrawable(geometry); std::vector > vertexLists;