FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Lilith Bryant, "This patch fixes a regression (introduced in @ rev 9228), where simple .dae files, that have no material assignments, will cause a crash on load.

Browse Source 
In particular, the case when the "instance_geometry" element has no "bind_material" sub-element.   This is valid, according to the official collada 1.4.1 specification."
This commit is contained in:
Robert Osfield
2009-12-16 15:05:14 +00:00
parent 7362b8b49f
commit 6cd8a23570
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/dae/daeRGeometry.cpp
View File

@@ -240,7 +240,10 @@ template< typename T >
void daeReader::processSinglePPrimitive(osg::Geode* geode, T *group, SourceMap &sources, GLenum mode )
{
osg::Geometry *geometry = new ReaderGeometry();
geometry->setName(group->getMaterial());
if (group->getMaterial() != NULL )
{
geometry->setName(group->getMaterial());
}
IndexMap index_map;
resolveArrays( group->getInput_array(), geometry, sources, index_map );
@@ -256,7 +259,10 @@ template< typename T >
void daeReader::processMultiPPrimitive(osg::Geode* geode, T *group, SourceMap &sources, GLenum mode )
{
osg::Geometry *geometry = new ReaderGeometry();
geometry->setName(group->getMaterial());
if (group->getMaterial() != NULL )
{
geometry->setName(group->getMaterial());
}
IndexMap index_map;
resolveArrays( group->getInput_array(), geometry, sources, index_map );
@@ -275,7 +281,10 @@ void daeReader::processMultiPPrimitive(osg::Geode* geode, T *group, SourceMap &s
void daeReader::processPolylist(osg::Geode* geode, domPolylist *group, SourceMap &sources )
{
osg::Geometry *geometry = new ReaderGeometry();
geometry->setName(group->getMaterial());
if (group->getMaterial() != NULL )
{
geometry->setName(group->getMaterial());
}
IndexMap index_map;
resolveArrays( group->getInput_array(), geometry, sources, index_map );
@@ -518,3 +527,4 @@ void daeReader::resolveArrays( domInputLocalOffset_Array &inputs, osg::Geometry
inputNumber++;
}
}