blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T102992: GPencil Array doesn't respect restriction in Offset 

The problem was the bounding box was calculated using
all strokes, but if a filter is added, the bounding box must
include only selected strokes.

Fix by @frogstomp
This commit is contained in:
Aleš Jelovčan 2022-12-09 16:27:52 +01:00 committed by Antonio Vazquez
parent eac8e820f2
commit fe30856d83
Notes: blender-bot 2023-02-13 13:52:55 +01:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #103186, Crash with Geometry Nodes
Referenced by issue #102992, GPencil: Array modifier relative offset don't respect restriction by layer
Referenced by issue #102967, 3.4: Potential candidates for corrective releases
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
View File

@ -113,7 +113,45 @@ static void BKE_gpencil_instance_modifier_instance_tfm(Object *ob,
zero_v3(r_mat[3]);
}
}
static bool gpencil_data_selected_minmax(ArrayGpencilModifierData *mmd,
Object *ob,
float r_min[3],
float r_max[3])
{
bGPdata *gpd = (bGPdata *)ob->data;
bool changed = false;
INIT_MINMAX(r_min, r_max);
if (gpd == NULL) {
return changed;
}
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
bGPDframe *gpf = gpl->actframe;
if (gpf != NULL) {
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
if (is_stroke_affected_by_modifier(ob,
mmd->layername,
mmd->material,
mmd->pass_index,
mmd->layer_pass,
1,
gpl,
gps,
mmd->flag & GP_ARRAY_INVERT_LAYER,
mmd->flag & GP_ARRAY_INVERT_PASS,
mmd->flag & GP_ARRAY_INVERT_LAYERPASS,
mmd->flag & GP_ARRAY_INVERT_MATERIAL)) {
changed |= BKE_gpencil_stroke_minmax(gps, false, r_min, r_max);
}
}
}
}
return changed;
}
/* array modifier - generate geometry callback (for viewport/rendering) */
static void generate_geometry(GpencilModifierData *md,
Depsgraph *depsgraph,
@ -131,7 +169,7 @@ static void generate_geometry(GpencilModifierData *md,
if (mmd->flag & GP_ARRAY_USE_RELATIVE) {
float min[3];
float max[3];
if (BKE_gpencil_data_minmax(gpd, min, max)) {
if (gpencil_data_selected_minmax(mmd, ob, min, max)) {
sub_v3_v3v3(size, max, min);
/* Need a minimum size (for flat drawings). */
CLAMP3_MIN(size, 0.01f);