[Bf-blender-cvs] [b5acd1a] master: Fix T40829: Collada Export with 'Include Material Textures' selected crashes.
Bastien Montagne
noreply at git.blender.org
Sat Jun 28 22:15:12 CEST 2014
Commit: b5acd1aa87dc145f69c342a593b25de8faf472e1
Author: Bastien Montagne
Date: Sat Jun 28 21:51:04 2014 +0200
https://developer.blender.org/rBb5acd1aa87dc145f69c342a593b25de8faf472e1
Fix T40829: Collada Export with 'Include Material Textures' selected crashes.
Code would not check a texture did have a valid image pointer...
===================================================================
M source/blender/collada/EffectExporter.cpp
===================================================================
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 218f2db..3c35618 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];
More information about the Bf-blender-cvs
mailing list