Commit: 4cb5114e136f4ab2b12fe130dba3dff55031a9c8
Author: Sybren A. Stüvel
Date: Thu Mar 2 10:02:48 2017 +0100
Branches: master
https://developer.blender.org/rB4cb5114e136f4ab2b12fe130dba3dff55031a9c8
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 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
