From 153cebd95b21c02d6317fd68a0840a0e72aac497 Mon Sep 17 00:00:00 2001 From: Porteries Tristan Date: Sun, 24 May 2015 20:38:24 +0200 Subject: 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 --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 2f62ffdd698..3fc0215fe18 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; } -- cgit v1.2.3