From 18fda6d84c139d1e105dc58796f37effc31f35d5 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sat, 11 May 2013 03:20:19 +0000 Subject: 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. --- source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/gameengine/Converter') diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 86e8c9c6e76..8703a545a4f 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -601,7 +601,7 @@ void KX_BlenderSceneConverter::RegisterPolyMaterial(RAS_IPolyMaterial *polymat) 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 @@ RAS_IPolyMaterial *KX_BlenderSceneConverter::FindCachedPolyMaterial(struct Mater 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; } -- cgit v1.2.3