diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-03-02 12:02:48 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-06 17:47:00 +0300 |
| commit | 4cb5114e136f4ab2b12fe130dba3dff55031a9c8 (patch) | |
| tree | 76e4890bda96ebd907a5bdb0b58160dd58041e65 /source/blender/alembic | |
| parent | aaa88fac76d584d03c056faf73f9ab0be6f3466c (diff) | |
Alembic: removed unnecessary matrix copy
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 4ec949fce3c..859d818e451 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -267,13 +267,11 @@ void create_transform_matrix(Object *obj, float r_yup_mat[4][4]) * constraints and modifiers as well as the obj->parentinv matrix. */ invert_m4_m4(obj->parent->imat, obj->parent->obmat); mul_m4_m4m4(zup_mat, obj->parent->imat, obj->obmat); + copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP); } else { - copy_m4_m4(zup_mat, obj->obmat); + copy_m44_axis_swap(r_yup_mat, obj->obmat, ABC_YUP_FROM_ZUP); } - - - copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP); } bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string &name) |