[Bf-blender-cvs] [d21028183f] temp-sybren-alembic: Alembic: removed unnecessary matrix copy
Sybren A. Stüvel
noreply at git.blender.org
Thu Mar 2 10:14:16 CET 2017
Commit: d21028183fd71dc6321bbb4444bc1e705252f529
Author: Sybren A. Stüvel
Date: Thu Mar 2 10:02:48 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBd21028183fd71dc6321bbb4444bc1e705252f529
Alembic: removed unnecessary matrix copy
===================================================================
M source/blender/alembic/intern/abc_util.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 416cfb6344..10102b69fd 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -265,13 +265,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)
More information about the Bf-blender-cvs
mailing list