diff options
Diffstat (limited to 'source/blender/collada/collada_internal.h')
| -rw-r--r-- | source/blender/collada/collada_internal.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 32c3e7af874..278cd37ac66 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -26,7 +26,7 @@ public: // TODO need also for angle conversion, time conversion... - void mat4_from_dae(float out[][4], const COLLADABU::Math::Matrix4& in) + void dae_matrix_to_mat4(float out[][4], const COLLADABU::Math::Matrix4& in) { // in DAE, matrices use columns vectors, (see comments in COLLADABUMathMatrix4.h) // so here, to make a blender matrix, we swap columns and rows @@ -58,10 +58,13 @@ public: class TransformBase { public: - void decompose(float mat[][4], float *loc, float *rot, float *size) + void decompose(float mat[][4], float *loc, float eul[3], float quat[4], float *size) { - mat4_to_size( size,mat); - mat4_to_eul( rot,mat); + mat4_to_size(size, mat); + if (eul) + mat4_to_eul(eul, mat); + if (quat) + mat4_to_quat(quat, mat); copy_v3_v3(loc, mat[3]); } }; |