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

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

Browse Source
This commit is contained in:
Robert Osfield
2010-03-10 16:31:30 +00:00
parent 1e1c79f257
commit 08612666fa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<std::vector<GLuint> > 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<std::vector<GLuint> > vertexLists;