Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

1 files changed, 17 insertions, 0 deletions

diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index 54b15f07896..4360464ed32 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -465,6 +465,23 @@ void RAS_MeshObject::RemoveFromBuckets(void *clientobj)
 	}
 }
 
+void RAS_MeshObject::EndConversion()
+{
+#if 0
+	m_sharedvertex_map.clear(); // SharedVertex
+	vector<vector<SharedVertex> >	shared_null(0);
+	shared_null.swap( m_sharedvertex_map ); /* really free the memory */
+#endif
+
+	for (std::list<RAS_MeshMaterial>::iterator it = m_materials.begin();
+		 it != m_materials.end();
+		 ++it)
+	{
+		RAS_MeshSlot *ms = it->m_baseslot;
+		ms->UpdateDisplayArraysOffset();
+	}
+}
+
 //void RAS_MeshObject::Transform(const MT_Transform& trans)
 //{
 	//m_trans.translate(MT_Vector3(0,0,1));//.operator *=(trans);