Alembic: removed unnecessary matrix copy
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 2 Mar 2017 09:02:48 +0000 (10:02 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 6 Apr 2017 14:47:00 +0000 (16:47 +0200)
source/blender/alembic/intern/abc_util.cc

index 4ec949fce3cc4202a284c05a5ec3b262ada4f40a..859d818e451c4962b815016d20febbd1040e0501 100644 (file)
@@ -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)