diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-02 13:58:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-02 13:58:03 +0300 |
| commit | 7158e0eb4cfa32f49527f660f73031207bc8f8be (patch) | |
| tree | a7e692d87ad8bd0a4dcb074844b4d3bcb500f27b /source/blender/editors/transform/transform_convert.c | |
| parent | 75794f95c0d41fbc1d279058ec9293e69abdd5b2 (diff) | |
| parent | 460c9d3d92e9f74254d58c6bb07d7e4fcb53e8b7 (diff) | |
Merge branch 'master' into blender-projects-basicsblender-projects-basics
Diffstat (limited to 'source/blender/editors/transform/transform_convert.c')
| -rw-r--r-- | source/blender/editors/transform/transform_convert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 7a68ee1bfbf..a5b2442f11c 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -981,7 +981,7 @@ static void init_TransDataContainers(TransInfo *t, if (tc->use_local_mat) { BLI_assert((t->flag & T_2D_EDIT) == 0); - copy_m4_m4(tc->mat, objects[i]->obmat); + copy_m4_m4(tc->mat, objects[i]->object_to_world); copy_m3_m4(tc->mat3, tc->mat); /* for non-invertible scale matrices, invert_m4_m4_fallback() * can still provide a valid pivot */ @@ -1235,8 +1235,8 @@ void transform_convert_clip_mirror_modifier_apply(TransDataContainer *tc) if (mmd->mirror_ob) { float obinv[4][4]; - invert_m4_m4(obinv, mmd->mirror_ob->obmat); - mul_m4_m4m4(mtx, obinv, ob->obmat); + invert_m4_m4(obinv, mmd->mirror_ob->object_to_world); + mul_m4_m4m4(mtx, obinv, ob->object_to_world); invert_m4_m4(imtx, mtx); } |