diff options
| author | Sebastian Herholz <sebastian.herholz@intel.com> | 2022-11-09 11:13:08 +0300 |
|---|---|---|
| committer | Sebastian Herholz <sebastian.herholz@intel.com> | 2022-11-09 11:13:08 +0300 |
| commit | 98398f5a5da09955543efa47a84b51d5a03b8574 (patch) | |
| tree | 2c7f0edaafa7b62fcaa4ab30583a54c8877d8221 /source/blender/io/collada/ArmatureImporter.cpp | |
| parent | 3e3ec87846b264a87b50431abb4180e4f0f2193c (diff) | |
| parent | 638bf05a23e1ef7dddd3b5d42d9521d8849a4375 (diff) | |
Merge branch 'master' into cycles_path_guidingcycles_path_guiding
Diffstat (limited to 'source/blender/io/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/io/collada/ArmatureImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index 1310337f501..7de08f89b7d 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -114,7 +114,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, Object *ob_arm = skin->BKE_armature_from_object(); if (ob_arm) { float invmat[4][4]; - invert_m4_m4(invmat, ob_arm->obmat); + invert_m4_m4(invmat, ob_arm->object_to_world); mul_m4_m4m4(mat, invmat, mat); } @@ -708,7 +708,7 @@ void ArmatureImporter::set_pose(Object *ob_arm, copy_m4_m4(mat, obmat); float invObmat[4][4]; - invert_m4_m4(invObmat, ob_arm->obmat); + invert_m4_m4(invObmat, ob_arm->object_to_world); mul_m4_m4m4(pchan->pose_mat, invObmat, mat); } |