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, 2 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h
index dec27d2a056..501b749b464 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -31,6 +31,8 @@
 #ifndef __DATA_TRANSFER_INTERN_H__
 #define __DATA_TRANSFER_INTERN_H__
 
+#include "BKE_customdata.h"  /* For cd_datatransfer_interp */
+
 struct CustomDataTransferLayerMap;
 struct CustomData;
 struct ListBase;
@@ -38,11 +40,6 @@ struct ListBase;
 float data_transfer_interp_float_do(
         const int mix_mode, const float val_dst, const float val_src, const float mix_factor);
 
-/* Copied from BKE_customdata.h :( */
-typedef void (*cd_datatransfer_interp)(
-        const struct CustomDataTransferLayerMap *laymap, void *dest,
-        const void **sources, const float *weights, const int count, const float mix_factor);
-
 void data_transfer_layersmapping_add_item(
         struct ListBase *r_map, const int data_type, const int mix_mode,
         const float mix_factor, const float *mix_weights,