[Bf-blender-cvs] [763c78fccbf] blender2.8: Fix/workaround stupidity of CLang

Sergey Sharybin noreply at git.blender.org
Fri Sep 28 10:14:23 CEST 2018


Commit: 763c78fccbfda2e3e9518bbeb4fba900f821762f
Author: Sergey Sharybin
Date:   Fri Sep 28 10:11:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB763c78fccbfda2e3e9518bbeb4fba900f821762f

Fix/workaround stupidity of CLang

Seems there is something wrong with ternary operator
and type deduction.

Copying matrix to a variable with cleaner name seems
to be better solution than to force cast to an array.

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

M	source/blender/draw/intern/draw_debug.c

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

diff --git a/source/blender/draw/intern/draw_debug.c b/source/blender/draw/intern/draw_debug.c
index c748b8fb0d8..053d266ec34 100644
--- a/source/blender/draw/intern/draw_debug.c
+++ b/source/blender/draw/intern/draw_debug.c
@@ -111,14 +111,17 @@ void DRW_debug_m4_as_bbox(const float m[4][4], const float color[4], const bool
 {
 	BoundBox bb;
 	const float min[3] = {-1.0f, -1.0f, -1.0f}, max[3] = {1.0f, 1.0f, 1.0f};
-	float minv[4][4];
+	float project_matrix[4][4];
 	if (invert) {
-		invert_m4_m4(minv, m);
+		invert_m4_m4(project_matrix, m);
+	}
+	else {
+		copy_m4_m4(project_matrix, m);
 	}
 
 	BKE_boundbox_init_from_minmax(&bb, min, max);
 	for (int i = 0; i < 8; ++i) {
-		mul_project_m4_v3((invert) ? minv : m, bb.vec[i]);
+		mul_project_m4_v3(project_matrix, bb.vec[i]);
 	}
 	DRW_debug_bbox(&bb, color);
 }



More information about the Bf-blender-cvs mailing list