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

From Farshid Lashkari, "fix for the Collada loader where it would access a null string in some cases"

Browse Source
This commit is contained in:
Robert Osfield 2014-05-02 09:12:36 +00:00
parent 1f33e2a2a0
commit cf66750d7b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/dae/daeRMaterials.cpp
View File

@ -296,9 +296,10 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc )
// <technique profile="GOOGLEEARTH">
// <double_sided>0</double_sided>
// </technique>
if (strcmp(TechniqueArray[CurrentTechnique]->getProfile(), "GOOGLEEARTH") == 0)
const domTechniqueRef& TechniqueRef = TechniqueArray[CurrentTechnique];
if (TechniqueRef->getProfile() && strcmp(TechniqueRef->getProfile(), "GOOGLEEARTH") == 0)
{
const daeElementRefArray& ElementArray = TechniqueArray[CurrentTechnique]->getContents();
const daeElementRefArray& ElementArray = TechniqueRef->getContents();
size_t NumberOfElements = ElementArray.getCount();
size_t CurrentElement;
for (CurrentElement = 0; CurrentElement < NumberOfElements; CurrentElement++)
@ -307,7 +308,7 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc )
if (strcmp(pAny->getElementName(), "double_sided") == 0)
{
daeString Value = pAny->getValue();
if (strcmp(Value, "1") == 0)
if (Value && strcmp(Value, "1") == 0)
ss->setMode( GL_CULL_FACE, osg::StateAttribute::OFF );
}
}