diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-25 02:06:41 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-25 02:06:41 +0300 |
commit | 2b158861a3a516dd8f4dac73f8984230f02bc9de (patch) | |
tree | 9f53ceec22962a730b3ca50c1f252ec71c5a26e6 /source/blender/collada/AnimationImporter.cpp | |
parent | 94eb1897523d4cf464ea0cdf90ccbd7db90f997d (diff) | |
parent | d91f2ac37aa02d96a00d116fa55cdc9f55afd32c (diff) |
merged collada rework from master into blender 2.8
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
-rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index e63b70edcf5..48fb27bc533 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -817,7 +817,6 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a } float rot[4], loc[3], scale[3]; - transpose_m4(mat); bc_rotate_from_reference_quat(rot, qref, mat); copy_qt_qt(qref, rot); |