blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

fix:T50079 collada matrix and blender matrix are transposed. This was not regarded by the animation importer, so it was creating very odd results

This commit is contained in:
Gaia Clary 2018-02-16 16:58:20 +01:00
parent e1a686e444
commit 5bc2c17161
Notes: blender-bot 2023-02-14 06:11:13 +01:00 
Referenced by issue #54089, Pass Index in Object Info node does not refresh in Node Tree on change for Object Index
Referenced by issue #54092, "save buffers" option seams to apply color correction twice while rendering
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/collada/AnimationImporter.cpp
View File

@ -817,6 +817,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
}
float rot[4], loc[3], scale[3];
transpose_m4(mat);
bc_rotate_from_reference_quat(rot, qref, mat);
copy_qt_qt(qref, rot);

2
source/blender/collada/collada_utils.cpp
View File

@ -403,7 +403,7 @@ void bc_rotate_from_reference_quat(float quat_to[4], float quat_from[4], float m
mat4_to_quat(qd, matd);
mul_qt_qtqt(quat_to, quat_from, qd); // rot is the final rotation corresponding to mat_to
mul_qt_qtqt(quat_to, qd, quat_from); // rot is the final rotation corresponding to mat_to
}
void bc_triangulate_mesh(Mesh *me)