diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-05-11 07:20:19 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-05-11 07:20:19 +0400 |
| commit | 18fda6d84c139d1e105dc58796f37effc31f35d5 (patch) | |
| tree | 1d2437c66e7558db454b6e33630fbf9bdc074726 /source/gameengine/Converter | |
| parent | b0261a446d907a2f72d87212eac0b98199cf8708 (diff) | |
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.
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |