diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-11-07 18:09:54 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-11-07 18:09:54 +0300 |
| commit | b6b888f7fb706487d9e5ae6b0738201da5493b9f (patch) | |
| tree | 852f79b4532a1b93e75c2541ca0d181b00de08a2 /source/blender/io/collada/SkinInfo.cpp | |
| parent | a2377b60548f2fe5d46b14ecdf4cf83971432b5c (diff) | |
| parent | 95631c94c4bd08f8a7e9c713f624e934eb7eb7ae (diff) | |
Merge branch 'master' into gpencil-new-data-proposalgpencil-new-data-proposal
Diffstat (limited to 'source/blender/io/collada/SkinInfo.cpp')
| -rw-r--r-- | source/blender/io/collada/SkinInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index 0654bae3730..b4615635318 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -214,12 +214,12 @@ void SkinInfo::link_armature(bContext *C, ob->partype = PAROBJECT; BKE_object_workob_calc_parent(scene, ob, &workob); - invert_m4_m4(ob->parentinv, workob.obmat); + invert_m4_m4(ob->parentinv, workob.object_to_world); DEG_id_tag_update(&obn->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); #endif - copy_m4_m4(ob->obmat, bind_shape_matrix); - BKE_object_apply_mat4(ob, ob->obmat, false, false); + copy_m4_m4(ob->object_to_world, bind_shape_matrix); + BKE_object_apply_mat4(ob, ob->object_to_world, false, false); amd->deformflag = ARM_DEF_VGROUP; |