archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for own mistake with mat4_to_loc_rot_size(), flipping the scale on negative matrix isn't correct.

Browse Source
This commit is contained in:
Campbell Barton
2010-10-30 19:52:40 +00:00
parent 90e9970094
commit c2b9dfaff2
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -957,7 +957,6 @@ void mat4_to_loc_rot_size(float loc[3], float rot[3][3], float size[3], float wm
float mat3[3][3]; /* wmat -> 3x3 */
float mat3_n[3][3]; /* wmat -> normalized, 3x3 */
float imat3_n[3][3]; /* wmat -> normalized & inverted, 3x3 */
short is_neg;
/* location */
copy_v3_v3(loc, wmat[3]);
@@ -966,9 +965,8 @@ void mat4_to_loc_rot_size(float loc[3], float rot[3][3], float size[3], float wm
copy_m3_m4(mat3, wmat);
/* 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, mat3);
if(is_neg) {
if(is_negative_m3(mat3)) {
negate_v3(mat3_n[0]);
negate_v3(mat3_n[1]);
negate_v3(mat3_n[2]);
@@ -986,12 +984,6 @@ void mat4_to_loc_rot_size(float loc[3], float rot[3][3], float size[3], float wm
size[0]= mat3[0][0];
size[1]= mat3[1][1];
size[2]= mat3[2][2];
/* with a negative matrix, all scaled will be negative
* flipping isnt needed but nicer to result in a positive scale */
if(is_neg) {
negate_v3(size);
}
}
void scale_m3_fl(float m[][3], float scale)