archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for opencollada crash with r40164, missing NULL check.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-12 13:59:23 +00:00
parent 297f14a1d6
commit 97c78e25f0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/collada/EffectExporter.cpp
View File

@@ -178,7 +178,11 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
// ambient // ambient
/* ma->ambX is calculated only on render, so lets do it here manually and not rely on ma->ambX. */ /* 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"); ep.setAmbient(cot, false , "ambient");
// reflective, reflectivity // reflective, reflectivity