diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-21 20:05:10 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-23 16:14:22 +0300 |
commit | 339d0170d1843e6a67217cfc4085af8725708eca (patch) | |
tree | bea933748afd0ee880538ac485bac7af6d631e9c /source/blender/collada/ArmatureImporter.cpp | |
parent | 1729dd99981ad2d35582ebb67d32542a0e0b24bd (diff) |
collada: Simplify reading Node Matrix
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 13196c4a150..398c4a2c106 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -132,18 +132,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon // create a bone even if there's no joint data for it (i.e. it has no influence) if (!bone_is_skinned) { - float obmat[4][4]; - // bone-space - get_node_mat(obmat, node, NULL, NULL); - - // get world-space - if (parent) { - mul_m4_m4m4(mat, parent_mat, obmat); - } - else { - copy_m4_m4(mat, obmat); - } - + get_node_mat(mat, node, NULL, NULL, parent_mat); } if (parent) bone->parent = parent; |