diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-05 18:07:24 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-06 17:47:01 +0300 |
| commit | fa827374a7a0d51e71e974eb91299b15beb3d54e (patch) | |
| tree | a98cc9a26b9a558728639e3d774f108d175c4818 /source/blender/alembic | |
| parent | b6775cd6849d6f9cc3355ed2be7fa9d6cfe64a25 (diff) | |
Alembic: rotation mode issue in copy_m44_axis_swap, and added unit tests.
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 87ba0fc9cc8..224e0eccd00 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -200,7 +200,7 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod mat4_to_loc_rot_size(src_trans, src_rot, src_scale, src_mat); /* Get euler angles from rotation matrix. */ - mat3_to_eulO(euler, ROT_MODE_XYZ, src_rot); + mat3_to_eulO(euler, ROT_MODE_XZY, src_rot); /* Create X, Y, Z rotation matrices from euler angles. */ create_swapped_rotation_matrix(rot_x_mat, rot_y_mat, rot_z_mat, euler, mode); @@ -210,7 +210,7 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod mul_m3_m3m3(dst_rot, dst_rot, rot_y_mat); mul_m3_m3m3(dst_rot, dst_rot, rot_x_mat); - mat3_to_eulO(euler, ROT_MODE_XYZ, dst_rot); + mat3_to_eulO(euler, ROT_MODE_XZY, dst_rot); /* Start construction of dst_mat from rotation matrix */ unit_m4(dst_mat); |