[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56680] trunk/blender/source/gameengine/ Converter/KX_BlenderSceneConverter.cpp: BGE: Fix for [#34044] " Objects with no material don't have their "face image" always working on bge" reported by Dalai Felinto (dfelinto).

Mitchell Stokes mogurijin at gmail.com
Sat May 11 05:20:24 CEST 2013


Revision: 56680
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56680
Author:   moguri
Date:     2013-05-11 03:20:19 +0000 (Sat, 11 May 2013)
Log Message:
-----------
BGE: Fix for [#34044] "Objects with no material don't have their "face image" always working on bge" reported by Dalai Felinto (dfelinto).

NULL materials are no longer cached.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2013-05-11 02:43:35 UTC (rev 56679)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2013-05-11 03:20:19 UTC (rev 56680)
@@ -601,7 +601,7 @@
 
 void KX_BlenderSceneConverter::CachePolyMaterial(struct Material *mat, RAS_IPolyMaterial *polymat)
 {
-	if (m_use_mat_cache)
+	if (m_use_mat_cache && mat)
 		m_polymat_cache[mat] = polymat;
 }
 
@@ -612,7 +612,7 @@
 
 void KX_BlenderSceneConverter::CacheBlenderMaterial(struct Material *mat, BL_Material *blmat)
 {
-	if (m_use_mat_cache)
+	if (m_use_mat_cache && mat)
 		m_mat_cache[mat] = blmat;
 }
 




More information about the Bf-blender-cvs mailing list