forked from bartvdbraak/blender
BGE: Fix T45267 Lib load without material caching.
This commit is contained in:
parent
db8ccc18f7
commit
e61ead7d4c
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user