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/modifiers/intern/MOD_uvwarp.cc | |
| parent | a2377b60548f2fe5d46b14ecdf4cf83971432b5c (diff) | |
| parent | 95631c94c4bd08f8a7e9c713f624e934eb7eb7ae (diff) | |
Merge branch 'master' into gpencil-new-data-proposalgpencil-new-data-proposal
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvwarp.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvwarp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 4ec273bcbc6..a96b28b4e2e 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -72,10 +72,10 @@ static void matrix_from_obj_pchan(float mat[4][4], Object *ob, const char *bonen { bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, bonename); if (pchan) { - mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, ob->object_to_world, pchan->pose_mat); } else { - copy_m4_m4(mat, ob->obmat); + copy_m4_m4(mat, ob->object_to_world); } } |