[Bf-blender-cvs] [7675d3e6e23] lanpr-under-gp: LineArt: Overwrite frame flag now supported for baking.

[YimingWu]

Commit: 7675d3e6e231d06a9cde18f8c956d62996fe9220
Author: YimingWu
Date:   Wed Jul 15 13:40:35 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB7675d3e6e231d06a9cde18f8c956d62996fe9220

LineArt: Overwrite frame flag now supported for baking.

===================================================================

M	source/blender/editors/lineart/lineart_cpu.c

===================================================================

diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index ce94e4f2b54..6a4bbbc8fb8 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -3869,7 +3869,14 @@ static int lineart_bake_gpencil_strokes_exec(bContext *C, wmOperator *UNUSED(op)
             lmd = (LineartGpencilModifierData *)md;
             bGPdata *gpd = ob->data;
             bGPDlayer *gpl = BKE_gpencil_layer_get_by_name(gpd, lmd->target_layer, 1);
-            bGPDframe *gpf = BKE_gpencil_frame_addnew(gpl, frame);
+            bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, frame, GP_GETFRAME_ADD_NEW);
+
+            /* Clear original frame */
+            if ((scene->lineart.flags & LRT_GPENCIL_OVERWRITE) && gpf->strokes.first) {
+              BKE_gpencil_layer_frame_delete(gpl, gpf);
+              gpf = BKE_gpencil_layer_frame_get(gpl, frame, GP_GETFRAME_ADD_NEW);
+            }
+
             ED_generate_strokes_direct(
                 dg,
                 ob,