ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-26 16:15:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'blender-v4.1-release'

Browse source
This commit is contained in:
Brecht Van Lommel 2024-03-19 18:05:33 +01:00
commit f20d9fe5a5
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc
View file

@ -52,26 +52,27 @@ static bool lineart_mod_is_disabled(GpencilModifierData *md)
return disabled;
}
static void clear_strokes(Object *ob, GpencilModifierData *md, int frame)
static bool clear_strokes(Object *ob, GpencilModifierData *md, int frame)
{
if (md->type != eGpencilModifierType_Lineart) {
return;
return false;
}
LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
bGPdata *gpd = static_cast<bGPdata *>(ob->data);
bGPDlayer *gpl = BKE_gpencil_layer_get_by_name(gpd, lmd->target_layer, 1);
if (!gpl) {
return;
return false;
}
bGPDframe *gpf = BKE_gpencil_layer_frame_find(gpl, frame);
if (!gpf) {
/* No greasepencil frame found. */
return;
return false;
}
BKE_gpencil_layer_frame_delete(gpl, gpf);
return true;
}
static bool bake_strokes(Object *ob,
@ -183,7 +184,9 @@ static bool lineart_gpencil_bake_single_target(LineartBakeJob *bj, Object *ob, i
if (bj->overwrite_frames) {
LISTBASE_FOREACH (GpencilModifierData *, md, &ob->greasepencil_modifiers) {
if (md->type == eGpencilModifierType_Lineart) {
clear_strokes(ob, md, frame);
if (clear_strokes(ob, md, frame)) {
touched = true;
}
}
}
}