[Bf-blender-cvs] [1fb30758034] master: Fixed build error on Windows / VS2015

Sybren A. Stüvel noreply at git.blender.org
Mon Jul 3 16:09:30 CEST 2017


Commit: 1fb30758034c2f83862bb7fc5f30a1a4d7b4510b
Author: Sybren A. Stüvel
Date:   Mon Jul 3 15:50:19 2017 +0200
Branches: master
https://developer.blender.org/rB1fb30758034c2f83862bb7fc5f30a1a4d7b4510b

Fixed build error on Windows / VS2015

===================================================================

M	tests/gtests/blenlib/BLI_kdopbvh_test.cc

===================================================================

diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
index bc8cf58d69d..e713ddc1695 100644
--- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc
+++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
@@ -58,7 +58,10 @@ static void find_nearest_points_test(int points_len, float scale, int round, int
 {
 	struct RNG *rng = BLI_rng_new(random_seed);
 	BVHTree *tree = BLI_bvhtree_new(points_len, 0.0, 8, 8);
-	float (*points)[3] = (float (*)[3])MEM_mallocN(sizeof(float[3]) * points_len, __func__);
+
+	void *mem = MEM_mallocN(sizeof(float[3]) * points_len, __func__);
+	float (*points)[3] = (float (*)[3])mem;
+
 	for (int i = 0; i < points_len; i++) {
 		rng_v3_round(points[i], 3, rng, round, scale);
 		BLI_bvhtree_insert(tree, i, points[i], 1);




More information about the Bf-blender-cvs mailing list