Commit: 153cebd95b21c02d6317fd68a0840a0e72aac497
Author: Porteries Tristan
Date: Sun May 24 20:38:24 2015 +0200
Branches: master
https://developer.blender.org/rB153cebd95b21c02d6317fd68a0840a0e72aac497
BGE: Fix bug with default material and MTFace.
It set default material even if there are a MTface but no blender material.
Tested in GLSL and Multitexture.
Reviewers: HG1
===================================================================
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 2f62ffd..3fc0215 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1065,8 +1065,8 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object*
blenderobj, KX_Scene* scene,
else
ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
- /* ckeck for texface since texface _only_ is used as a fallback
*/
- if (ma == NULL && tface == NULL) {
+ // Check for blender material
+ if (ma == NULL) {
ma= &defmaterial;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
