[Bf-blender-cvs] [b48ba0909a] master: Collada - Import: now add bind_mat and rest_mat as custom properties (when the use_bind_info option is enabled)

[Gaia Clary]

Commit: b48ba0909a2a609fadc91e9f6e1c031b99e6464e
Author: Gaia Clary
Date:   Thu Mar 23 14:10:57 2017 +0100
Branches: master
https://developer.blender.org/rBb48ba0909a2a609fadc91e9f6e1c031b99e6464e

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

===================================================================

M	source/blender/collada/ArmatureImporter.cpp

===================================================================

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 2e4a7dfebc..0ea8324ed7 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