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, 0 insertions, 3 deletions

diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 8067fa5db2d..3799de011d4 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -37,7 +37,6 @@
 #include "DNA_customdata_types.h"
 
 struct AnimData;
-struct DerivedMesh;
 struct Ipo;
 struct Key;
 struct MCol;
@@ -47,13 +46,11 @@ struct MLoop;
 struct MLoopCol;
 struct MLoopUV;
 struct MPoly;
-struct MSticky;
 struct MTexPoly;
 struct MVert;
 struct Material;
 struct Mesh;
 struct Multires;
-struct OcInfo;
 
 typedef struct Mesh {
 	ID id;