diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-08 20:13:59 +0300 |
| commit | e59ebfef3c583985553e78492cf8cd07bbe7648e (patch) | |
| tree | 35f31c3b592f40885baf8d8b078844c92bfbabe7 /source/blender/blenkernel/intern/armature_deform.c | |
| parent | fe7088c99ff084f7218ab20136d49eb1a1dccd0b (diff) | |
| parent | 4c182aef7ce0e8c26dd2b85c1fa2cd45c2ef64ea (diff) | |
Merge branch 'master' into temp-sculpt-brush-channeltemp-sculpt-brush-channel
Diffstat (limited to 'source/blender/blenkernel/intern/armature_deform.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature_deform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c index 89afb886fc2..64a3937c191 100644 --- a/source/blender/blenkernel/intern/armature_deform.c +++ b/source/blender/blenkernel/intern/armature_deform.c @@ -582,9 +582,9 @@ static void armature_deform_coords_impl(const Object *ob_arm, }; float obinv[4][4]; - invert_m4_m4(obinv, ob_target->obmat); + invert_m4_m4(obinv, ob_target->object_to_world); - mul_m4_m4m4(data.postmat, obinv, ob_arm->obmat); + mul_m4_m4m4(data.postmat, obinv, ob_arm->object_to_world); invert_m4_m4(data.premat, data.postmat); if (em_target != NULL) { |