From 56617a4bfbbfb47992b22492caaf5fad56ff849a Mon Sep 17 00:00:00 2001 From: flashk Date: Thu, 11 Oct 2018 16:13:01 -0700 Subject: [PATCH] Fix crash in Collada loader The collada loader would crash when processing effects that didn't have a technique defined. --- src/osgPlugins/dae/daeRMaterials.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/dae/daeRMaterials.cpp b/src/osgPlugins/dae/daeRMaterials.cpp index d4c2703b2..c2d2b3cde 100644 --- a/src/osgPlugins/dae/daeRMaterials.cpp +++ b/src/osgPlugins/dae/daeRMaterials.cpp @@ -280,10 +280,10 @@ void daeReader::processProfileCOMMON(osg::StateSet *ss, domProfile_COMMON *pc ) { domProfile_COMMON::domTechnique *teq = pc->getTechnique(); - domProfile_COMMON::domTechnique::domConstant *c = teq->getConstant(); - domProfile_COMMON::domTechnique::domLambert *l = teq->getLambert(); - domProfile_COMMON::domTechnique::domPhong *p = teq->getPhong(); - domProfile_COMMON::domTechnique::domBlinn *b = teq->getBlinn(); + domProfile_COMMON::domTechnique::domConstant *c = teq ? teq->getConstant() : NULL; + domProfile_COMMON::domTechnique::domLambert *l = teq ? teq->getLambert() : NULL; + domProfile_COMMON::domTechnique::domPhong *p = teq ? teq->getPhong() : NULL; + domProfile_COMMON::domTechnique::domBlinn *b = teq ? teq->getBlinn() : NULL; ss->setMode( GL_CULL_FACE, osg::StateAttribute::ON ); // Cull Back faces