Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-06-28 23:51:04 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-06-29 00:13:04 +0400
commitb5acd1aa87dc145f69c342a593b25de8faf472e1 (patch)
tree6bc7ff3be840dfad035cb76ff92db466eede17b7 /source/blender/collada
parent683743b36092373582b0d3808d8ffdc82c67990a (diff)
Fix T40829: Collada Export with 'Include Material Textures' selected crashes.
Code would not check a texture did have a valid image pointer...
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/EffectExporter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 218f2db54e3..3c35618a4cd 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -372,6 +372,10 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
MTex *t = ma->mtex[tex_indices[a]];
Image *ima = t->tex->ima;
+ if (!ima) {
+ continue;
+ }
+
std::string key(id_name(ima));
key = translate_id(key);
int i = im_samp_map[key];