Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-04-03 20:57:37 +0300
committerHans Goudey <h.goudey@me.com>2022-04-03 20:57:37 +0300
commit637fe6f5ff9c8f09bdbd8e37f6d67b29e79b4a39 (patch)
tree4ab31bc1a1a434f47938e98af738f89f732ddd1a
parent933d56d9e98d3bedd828abc6cea7d7e37fb7206b (diff)
Fix T97001: Grease pencil array modifier relative offset broken
This has been broken for two years, since rB29f3af952725, which retrieved the bounding box from an object and immediately overwrote it with -1, 1. That commit had another problem though-- the modifier stack shouldn't use object level data, it should use data from the previous modifier. Differential Revision: https://developer.blender.org/D14524
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index f3669673094..38866bcd32a 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -132,13 +132,13 @@ static void generate_geometry(GpencilModifierData *md,
/* Get bounbox for relative offset. */
float size[3] = {0.0f, 0.0f, 0.0f};
if (mmd->flag & GP_ARRAY_USE_RELATIVE) {
- BoundBox bb;
- const float min[3] = {-1.0f, -1.0f, -1.0f}, max[3] = {1.0f, 1.0f, 1.0f};
- BKE_boundbox_init_from_minmax(&bb, min, max);
- BKE_boundbox_calc_size_aabb(&bb, size);
- mul_v3_fl(size, 2.0f);
- /* Need a minimum size (for flat drawings). */
- CLAMP3_MIN(size, 0.01f);
+ float min[3];
+ float max[3];
+ if (BKE_gpencil_data_minmax(gpd, min, max)) {
+ sub_v3_v3v3(size, max, min);
+ /* Need a minimum size (for flat drawings). */
+ CLAMP3_MIN(size, 0.01f);
+ }
}
int seed = mmd->seed;