apply world matrix only to armature, Bones and children get it implicit via parenting

2 files changed, 14 insertions, 7 deletions

diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 71dd7f280d0..5d47ce155c8 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -86,17 +86,15 @@ JointData *ArmatureImporter::get_joint_data(COLLADAFW::Node *node);
 void ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBone *parent, int totchild,
                                    float parent_mat[4][4], bArmature *arm)
 {
+	float mat[4][4];
+	float joint_inv_bind_mat[4][4];
+
 	//Checking if bone is already made.
 	std::vector<COLLADAFW::Node *>::iterator it;
 	it = std::find(finished_joints.begin(), finished_joints.end(), node);
 	if (it != finished_joints.end()) return;
 
-	float joint_inv_bind_mat[4][4];
-
 	// JointData* jd = get_joint_data(node);
-
-	float mat[4][4];
-	float obmat[4][4];
 	
 	// TODO rename from Node "name" attrs later
 	EditBone *bone = ED_armature_edit_bone_add(arm, (char *)bc_get_joint_name(node));
@@ -105,9 +103,18 @@ void ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBo
 	if (skin && skin->get_joint_inv_bind_matrix(joint_inv_bind_mat, node)) {
 		// get original world-space matrix
 		invert_m4_m4(mat, joint_inv_bind_mat);
+
+		// And make local to armature
+		Object *ob_arm = skin->BKE_armature_from_object();
+		if (ob_arm) {
+			float invmat[4][4];
+			invert_m4_m4(invmat, ob_arm->obmat);
+			mul_m4_m4m4(mat, invmat, mat);
+		}
 	}
 	// create a bone even if there's no joint data for it (i.e. it has no influence)
 	else {
+		float obmat[4][4];
 		// bone-space
 		get_node_mat(obmat, node, NULL, NULL);
 
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index c2770dc3dc5..7ae1750d2ca 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -226,8 +226,6 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	ArmatureModifierData *amd = (ArmatureModifierData *)md;
 	amd->object = ob_arm;
 
-	copy_m4_m4(ob->obmat, bind_shape_matrix);
-	BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
 #if 1
 	bc_set_parent(ob, ob_arm, C);
 #else
@@ -243,6 +241,8 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
 	DAG_relations_tag_update(bmain);
 	WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
+	copy_m4_m4(ob->obmat, bind_shape_matrix);
+	BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
 
 	amd->deformflag = ARM_DEF_VGROUP;