blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Collada - Import: now add bind_mat and rest_mat as custom properties (when the use_bind_info option is enabled)

This commit is contained in:
Gaia Clary 2017-03-23 14:10:57 +01:00
parent 476f5c473a
commit b48ba0909a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/collada/ArmatureImporter.cpp
View File

@ -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