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, 1 insertions, 7 deletions

diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 4f352379d39..a6f1a1cafc6 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -132,13 +132,7 @@ public:
 	virtual void		AddMeshUser(void *clientobj, SG_QList *head, RAS_Deformer* deformer);
 
 	void				RemoveFromBuckets(void *clientobj);
-	void				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
-	}
+	void				EndConversion();
 
 	/* colors */
 	void				DebugColor(unsigned int abgr);