Changeset 11196

Show
Ignore:
Timestamp:
03/10/10 17:31:30 (4 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/dae/daeRGeometry.cpp

    r11152 r11196  
    459459{ 
    460460    osg::Geometry *geometry = new osg::Geometry(); 
    461     geometry->setName(group->getMaterial()); 
     461    if (NULL != group->getMaterial()) 
     462        geometry->setName(group->getMaterial()); 
    462463    geode->addDrawable( geometry ); 
    463464 
     
    478479{ 
    479480    osg::Geometry *geometry = new osg::Geometry(); 
    480     geometry->setName(group->getMaterial()); 
     481    if (NULL != group->getMaterial()) 
     482        geometry->setName(group->getMaterial()); 
    481483    geode->addDrawable( geometry ); 
    482484 
     
    503505 
    504506    osg::Geometry* geometry = new osg::Geometry(); 
    505     geometry->setName(group->getMaterial()); 
     507    if (NULL != group->getMaterial()) 
     508        geometry->setName(group->getMaterial()); 
    506509    geode->addDrawable(geometry); 
    507510