diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2022-02-21 21:51:50 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2022-02-21 21:51:50 +0300 |
commit | 48abcc91aed521bd8b207553bde0dc8817db5c60 (patch) | |
tree | 11188129cb1c2a5dcb0c1cf60740594ad2a91a3a /source/blender/gpencil_modifiers | |
parent | 9762dbe94e65e4f42061fdbb941a4c12660a6722 (diff) | |
parent | 49ae0b5b3c929e91aa9d4292fe9c002c6c9dfe5b (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index e036b814916..fba83579ab1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -104,7 +104,9 @@ static void BKE_gpencil_instance_modifier_instance_tfm(Object *ob, float obinv[4][4]; unit_m4(mat_offset); - add_v3_v3(mat_offset[3], mmd->offset); + if (mmd->flag & GP_ARRAY_USE_OFFSET) { + add_v3_v3(mat_offset[3], mmd->offset); + } invert_m4_m4(obinv, ob->obmat); mul_m4_series(r_offset, mat_offset, obinv, mmd->object->obmat); |