[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32717] trunk/blender/source/blender/ blenlib: dont use const for matrix arg, since it needs to be cast in most cases.

Campbell Barton ideasman42 at gmail.com
Tue Oct 26 22:41:16 CEST 2010


Revision: 32717
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32717
Author:   campbellbarton
Date:     2010-10-26 22:41:16 +0200 (Tue, 26 Oct 2010)

Log Message:
-----------
dont use const for matrix arg, since it needs to be cast in most cases.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_math_matrix.h
    trunk/blender/source/blender/blenlib/intern/math_matrix.c

Modified: trunk/blender/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_matrix.h	2010-10-26 19:13:17 UTC (rev 32716)
+++ trunk/blender/source/blender/blenlib/BLI_math_matrix.h	2010-10-26 20:41:16 UTC (rev 32717)
@@ -102,9 +102,9 @@
 void transpose_m4(float R[4][4]);
 
 void normalize_m3(float R[3][3]);
-void normalize_m3_m3(float R[3][3], const float A[3][3]);
+void normalize_m3_m3(float R[3][3], float A[3][3]);
 void normalize_m4(float R[4][4]);
-void normalize_m4_m4(float R[4][4], const float A[4][4]);
+void normalize_m4_m4(float R[4][4], float A[4][4]);
 
 void orthogonalize_m3(float R[3][3], int axis);
 void orthogonalize_m4(float R[4][4], int axis);

Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-10-26 19:13:17 UTC (rev 32716)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-10-26 20:41:16 UTC (rev 32717)
@@ -750,7 +750,7 @@
 	normalize_v3(mat[2]);
 }
 
-void normalize_m3_m3(float rmat[][3], const float mat[][3])
+void normalize_m3_m3(float rmat[][3], float mat[][3])
 {	
 	normalize_v3_v3(rmat[0], mat[0]);
 	normalize_v3_v3(rmat[1], mat[1]);
@@ -770,7 +770,7 @@
 	if(len!=0.0) mat[2][3]/= len;
 }
 
-void normalize_m4_m4(float rmat[][4], const float mat[][4])
+void normalize_m4_m4(float rmat[][4], float mat[][4])
 {
 	float len;
 	
@@ -967,7 +967,7 @@
 	/* so scale doesnt interfear with rotation [#24291] */
 	/* note: this is a workaround for negative matrix not working for rotation conversion, FIXME */
 	is_neg= is_negative_m3(mat3);
-	normalize_m3_m3(mat3_n, (const float(*)[3])mat3);
+	normalize_m3_m3(mat3_n, mat3);
 	if(is_neg) {
 		negate_v3(mat3_n[0]);
 		negate_v3(mat3_n[1]);





More information about the Bf-blender-cvs mailing list