diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-23 16:10:57 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-23 16:14:23 +0300 |
| commit | b48ba0909a2a609fadc91e9f6e1c031b99e6464e (patch) | |
| tree | 9a83507580fd4041f67f152fb111c7cdcdc9aa47 /source/blender/collada | |
| parent | 476f5c473ac752d58922e1fefbcbb5e8078d178d (diff) | |
Collada - Import: now add bind_mat and rest_mat as custom properties (when the use_bind_info option is enabled)
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 2e4a7dfebc7..0ea8324ed7c 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -42,6 +42,7 @@ extern "C" { #include "ED_armature.h" } +#include "collada_utils.h" #include "ArmatureImporter.h" // use node name, or fall back to original id if not present (name is optional) @@ -171,7 +172,8 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon { float rest_mat[4][4]; get_node_mat(rest_mat, node, NULL, NULL, NULL); - bc_create_bindpose_properties(this->import_settings, bone, joint_bind_mat, rest_mat); + bc_set_IDPropertyMatrix(bone, "bind_mat", joint_bind_mat); + bc_set_IDPropertyMatrix(bone, "rest_mat", rest_mat); } add_v3_v3v3(bone->tail, bone->head, tail); //tail must be non zero |