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, 9 insertions, 10 deletions

diff --git a/intern/cycles/bvh/bvh_build.h b/intern/cycles/bvh/bvh_build.h
index 294c5a1758d..eefb7b60f7c 100644
--- a/intern/cycles/bvh/bvh_build.h
+++ b/intern/cycles/bvh/bvh_build.h
@@ -42,13 +42,12 @@ class BVHBuild
 {
 public:
 	/* Constructor/Destructor */
-	BVHBuild(
-		const vector<Object*>& objects,
-		vector<int>& prim_type,
-		vector<int>& prim_index,
-		vector<int>& prim_object,
-		const BVHParams& params,
-		Progress& progress);
+	BVHBuild(const vector<Object*>& objects,
+	         array<int>& prim_type,
+	         array<int>& prim_index,
+	         array<int>& prim_object,
+	         const BVHParams& params,
+	         Progress& progress);
 	~BVHBuild();
 
 	BVHNode *run();
@@ -99,9 +98,9 @@ protected:
 	int num_original_references;
 
 	/* output primitive indexes and objects */
-	vector<int>& prim_type;
-	vector<int>& prim_index;
-	vector<int>& prim_object;
+	array<int>& prim_type;
+	array<int>& prim_index;
+	array<int>& prim_object;
 
 	/* build parameters */
 	BVHParams params;