Revision: 40166 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40166 Author: campbellbarton Date: 2011-09-12 13:59:23 +0000 (Mon, 12 Sep 2011) Log Message: ----------- fix for opencollada crash with r40164, missing NULL check.
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40164 Modified Paths: -------------- trunk/blender/source/blender/collada/EffectExporter.cpp Modified: trunk/blender/source/blender/collada/EffectExporter.cpp =================================================================== --- trunk/blender/source/blender/collada/EffectExporter.cpp 2011-09-12 13:58:13 UTC (rev 40165) +++ trunk/blender/source/blender/collada/EffectExporter.cpp 2011-09-12 13:59:23 UTC (rev 40166) @@ -178,7 +178,11 @@ // ambient /* ma->ambX is calculated only on render, so lets do it here manually and not rely on ma->ambX. */ - cot = getcol(this->scene->world->ambr*ma->amb, this->scene->world->ambg*ma->amb, this->scene->world->ambb*ma->amb, 1.0f); + if(this->scene->world) + cot = getcol(this->scene->world->ambr*ma->amb, this->scene->world->ambg*ma->amb, this->scene->world->ambb*ma->amb, 1.0f); + else + cot = getcol(ma->amb, ma->amb, ma->amb, 1.0f); + ep.setAmbient(cot, false , "ambient"); // reflective, reflectivity _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs