[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54589] trunk/blender/source/gameengine/ Converter: BGE: Fix for issue #34242 "It does not render in "P" mode for Game engine if you UV mapa a face of a cube" reported by joaclint .

Mitchell Stokes mogurijin at gmail.com
Sat Feb 16 05:38:56 CET 2013


Revision: 54589
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54589
Author:   moguri
Date:     2013-02-16 04:38:53 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
BGE: Fix for issue #34242 "It does not render in "P" mode for Game engine if you UV mapa a face of a cube" reported by joaclint.

Material caching can now be disabled for Multitexture and GLSL Materials.

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

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-02-15 23:48:36 UTC (rev 54588)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-02-16 04:38:53 UTC (rev 54589)
@@ -921,9 +921,6 @@
 		/* do Texture Face materials */
 		Image* bima = (tface)? (Image*)tface->tpage: NULL;
 		STR_String imastr =  (tface)? (bima? (bima)->id.name : "" ) : "";
-
-		if (!converter->GetCacheMaterials())
-			polymat = NULL;
 		
 		char alpha_blend=0;
 		short tile=0;
@@ -1045,9 +1042,8 @@
 				polymat->m_specular.setValue(0.0f,0.0f,0.0f);
 				polymat->m_shininess = 35.0;
 			}
-			
-			if (converter->GetCacheMaterials())
-				converter->CachePolyMaterial(ma, polymat);
+
+			converter->CachePolyMaterial(ma, polymat);
 		}
 	}
 	

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2013-02-15 23:48:36 UTC (rev 54588)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2013-02-16 04:38:53 UTC (rev 54589)
@@ -601,22 +601,24 @@
 
 void KX_BlenderSceneConverter::CachePolyMaterial(struct Material *mat, RAS_IPolyMaterial *polymat)
 {
-	m_polymat_cache[mat] = polymat;
+	if (m_use_mat_cache)
+		m_polymat_cache[mat] = polymat;
 }
 
 RAS_IPolyMaterial *KX_BlenderSceneConverter::FindCachedPolyMaterial(struct Material *mat)
 {
-	return m_polymat_cache[mat];
+	return (m_use_mat_cache) ? m_polymat_cache[mat] : NULL;
 }
 
 void KX_BlenderSceneConverter::CacheBlenderMaterial(struct Material *mat, BL_Material *blmat)
 {
-	m_mat_cache[mat] = blmat;
+	if (m_use_mat_cache)
+		m_mat_cache[mat] = blmat;
 }
 
 BL_Material *KX_BlenderSceneConverter::FindCachedBlenderMaterial(struct Material *mat)
 {
-	return m_mat_cache[mat];
+	return (m_use_mat_cache) ? m_mat_cache[mat] : NULL;
 }
 
 void KX_BlenderSceneConverter::RegisterInterpolatorList(




More information about the Bf-blender-cvs mailing list