enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu.

3 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 79030e3adfa..5237335e8ca 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1708,7 +1708,7 @@ void object_apply_mat4(Object *ob, float mat[][4])
 	/* rotation */
 	copy_m3_m4(mat3, mat);
 	/* so scale doesnt interfear with rotation [#24291] */
-	normalize_m3_m3(mat3_n, mat3);
+	normalize_m3_m3(mat3_n, (const float(*)[3])mat3);
 
 	object_mat3_to_rot(ob, mat3_n, 0);
 
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index 294546bb222..6b3d8bf9d0b 100644
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@ -102,9 +102,9 @@ void transpose_m3(float R[3][3]);
 void transpose_m4(float R[4][4]);
 
 void normalize_m3(float R[3][3]);
-void normalize_m3_m3(float R[3][3], float A[3][3]);
+void normalize_m3_m3(float R[3][3], const float A[3][3]);
 void normalize_m4(float R[4][4]);
-void normalize_m4_m4(float R[4][4], float A[4][4]);
+void normalize_m4_m4(float R[4][4], const float A[4][4]);
 
 void orthogonalize_m3(float R[3][3], int axis);
 void orthogonalize_m4(float R[4][4], int axis);
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 197d3676367..9bbd0fc64ac 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -750,7 +750,7 @@ void normalize_m3(float mat[][3])
 	normalize_v3(mat[2]);
 }
 
-void normalize_m3_m3(float rmat[][3], float mat[][3])
+void normalize_m3_m3(float rmat[][3], const float mat[][3])
 {	
 	normalize_v3_v3(rmat[0], mat[0]);
 	normalize_v3_v3(rmat[1], mat[1]);
@@ -770,7 +770,7 @@ void normalize_m4(float mat[][4])
 	if(len!=0.0) mat[2][3]/= len;
 }
 
-void normalize_m4_m4(float rmat[][4], float mat[][4])
+void normalize_m4_m4(float rmat[][4], const float mat[][4])
 {
 	float len;