1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton 2010-10-26 20:41:16 +00:00
parent d5f66ea925
commit a44f4dd400
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_math_matrix.h
View File

@ -102,9 +102,9 @@ void transpose_m3(float R[3][3]);
void transpose_m4(float R[4][4]); void transpose_m4(float R[4][4]);
void normalize_m3(float R[3][3]); 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(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_m3(float R[3][3], int axis);
void orthogonalize_m4(float R[4][4], int axis); void orthogonalize_m4(float R[4][4], int axis);

6
source/blender/blenlib/intern/math_matrix.c
View File

@ -750,7 +750,7 @@ void normalize_m3(float mat[][3])
normalize_v3(mat[2]); 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[0], mat[0]);
normalize_v3_v3(rmat[1], mat[1]); 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; 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; 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] */ /* so scale doesnt interfear with rotation [#24291] */
/* note: this is a workaround for negative matrix not working for rotation conversion, FIXME */ /* note: this is a workaround for negative matrix not working for rotation conversion, FIXME */
is_neg= is_negative_m3(mat3); is_neg= is_negative_m3(mat3);
normalize_m3_m3(mat3_n, (const float(*)[3])mat3); normalize_m3_m3(mat3_n, mat3);
if(is_neg) { if(is_neg) {
negate_v3(mat3_n[0]); negate_v3(mat3_n[0]);
negate_v3(mat3_n[1]); negate_v3(mat3_n[1]);