sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE: Fix T45267 Lib load without material caching.

Browse Source
This commit is contained in:
Porteries Tristan 2015-07-02 12:20:13 +02:00
parent db8ccc18f7
commit e61ead7d4c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@ -1361,14 +1361,18 @@ bool KX_BlenderSceneConverter::MergeScene(KX_Scene *to, KX_Scene *from)
} }
MaterialCache::iterator matcacheit = m_mat_cache.find(from); MaterialCache::iterator matcacheit = m_mat_cache.find(from);
// Merge cached BL_Material map. if (matcacheit != m_mat_cache.end()) {
m_mat_cache[to].insert(matcacheit->second.begin(), matcacheit->second.end()); // Merge cached BL_Material map.
m_mat_cache.erase(matcacheit); m_mat_cache[to].insert(matcacheit->second.begin(), matcacheit->second.end());
m_mat_cache.erase(matcacheit);
}
PolyMaterialCache::iterator polymatcacheit = m_polymat_cache.find(from); PolyMaterialCache::iterator polymatcacheit = m_polymat_cache.find(from);
// Merge cached RAS_IPolyMaterial map. if (polymatcacheit != m_polymat_cache.end()) {
m_polymat_cache[to].insert(polymatcacheit->second.begin(), polymatcacheit->second.end()); // Merge cached RAS_IPolyMaterial map.
m_polymat_cache.erase(polymatcacheit); m_polymat_cache[to].insert(polymatcacheit->second.begin(), polymatcacheit->second.end());
m_polymat_cache.erase(polymatcacheit);
}
return true; return true;
} }