Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-27 00:41:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-27 00:41:16 +0400
commita44f4dd40059e6303ce40a76818e9f0c60bdd06e (patch)
tree3bff3c72bf9059790761ff60bd7dbed8e10dd329
parentd5f66ea92584ce0d707387c9daebd05913c7209a (diff)
dont use const for matrix arg, since it needs to be cast in most cases.
-rw-r--r--source/blender/blenlib/BLI_math_matrix.h4
-rw-r--r--source/blender/blenlib/intern/math_matrix.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index 76de8f827be..2144107a6cd 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], 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);
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 80d7709f3a9..4cd4ea2a12b 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], 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 @@ void normalize_m4(float mat[][4])
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 @@ void mat4_to_loc_rot_size(float loc[3], float rot[3][3], float size[3], float wm
/* 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]);