diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 17:59:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 17:59:23 +0400 |
| commit | 97c78e25f00391e068b1247fa32b47fe2bf244e8 (patch) | |
| tree | 8c3c8f3d0403c7f5d9257336d3fdba0037d8299c /source/blender | |
| parent | 297f14a1d623832f4d77ca0740f3ce4bad7fe767 (diff) | |
fix for opencollada crash with r40164, missing NULL check.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index b4cc88ee3b8..6863e26a3ce 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -178,7 +178,11 @@ void EffectsExporter::operator()(Material *ma, Object *ob) // 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 |