diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 15:10:04 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 15:10:04 +0400 |
| commit | 5c69338fe61d24924dfb3d9a5c9f960b62cc6e7e (patch) | |
| tree | 0864f7421d5cc7a0b49456651f583246a19ea529 /source/blender/collada/SkinInfo.cpp | |
| parent | 76e989d7b1303c877e8469513eae4ed746a8efe5 (diff) | |
apply world matrix only to armature, Bones and children get it implicit via parenting
Diffstat (limited to 'source/blender/collada/SkinInfo.cpp')
| -rw-r--r-- | source/blender/collada/SkinInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |