GPencil: Refactor Append operators

Now the operators work like other areas of Blender using the list of selected objects.

Also, the name has been changed to:

```Layers:
- Copy Layer to Selected
- Copy All Layers to Selected

Materials:
- Copy Material to Selected
- Copy All Materials to Selected```

Reviewed By: mendio, pablovazquez, pepeland

Differential Revision: https://developer.blender.org/D11216

14 files changed, 95 insertions, 148 deletions

diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 5c40bc8e418..c155587e95a 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -1548,7 +1548,7 @@ static void annotation_paint_initstroke(tGPsdata *p,
   if (p->gpl == NULL) {
     /* tag for annotations */
     p->gpd->flag |= GP_DATA_ANNOTATIONS;
-    p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("Note"), true);
+    p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("Note"), true, false);
 
     if (p->custom_color[3]) {
       copy_v3_v3(p->gpl->color, p->custom_color);
diff --git a/source/blender/editors/gpencil/gpencil_add_blank.c b/source/blender/editors/gpencil/gpencil_add_blank.c
index 3bd61d5c88a..3aa16e54597 100644
--- a/source/blender/editors/gpencil/gpencil_add_blank.c
+++ b/source/blender/editors/gpencil/gpencil_add_blank.c
@@ -90,7 +90,7 @@ void ED_gpencil_create_blank(bContext *C, Object *ob, float UNUSED(mat[4][4]))
   ob->actcol = color_black + 1;
 
   /* layers */
-  bGPDlayer *layer = BKE_gpencil_layer_addnew(gpd, "GP_Layer", true);
+  bGPDlayer *layer = BKE_gpencil_layer_addnew(gpd, "GP_Layer", true, false);
 
   /* frames */
   BKE_gpencil_frame_addnew(layer, CFRA);
diff --git a/source/blender/editors/gpencil/gpencil_add_lineart.c b/source/blender/editors/gpencil/gpencil_add_lineart.c
index 6b28c6ec13e..ac0da0ad1db 100644
--- a/source/blender/editors/gpencil/gpencil_add_lineart.c
+++ b/source/blender/editors/gpencil/gpencil_add_lineart.c
@@ -96,7 +96,7 @@ void ED_gpencil_create_lineart(bContext *C, Object *ob)
   ob->actcol = color_black + 1;
 
   /* layers */
-  bGPDlayer *lines = BKE_gpencil_layer_addnew(gpd, "Lines", true);
+  bGPDlayer *lines = BKE_gpencil_layer_addnew(gpd, "Lines", true, false);
 
   /* frames */
   BKE_gpencil_frame_addnew(lines, 0);
diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 4497d963c6d..d8734c4ae6b 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -837,8 +837,8 @@ void ED_gpencil_create_monkey(bContext *C, Object *ob, float mat[4][4])
 
   /* layers */
   /* NOTE: For now, we just add new layers, to make it easier to separate out old/new instances */
-  bGPDlayer *Fills = BKE_gpencil_layer_addnew(gpd, "Fills", false);
-  bGPDlayer *Lines = BKE_gpencil_layer_addnew(gpd, "Lines", true);
+  bGPDlayer *Fills = BKE_gpencil_layer_addnew(gpd, "Fills", false, false);
+  bGPDlayer *Lines = BKE_gpencil_layer_addnew(gpd, "Lines", true, false);
 
   /* frames */
   /* NOTE: No need to check for existing, as this will take care of it for us */
diff --git a/source/blender/editors/gpencil/gpencil_add_stroke.c b/source/blender/editors/gpencil/gpencil_add_stroke.c
index 26237636526..e95496b51ee 100644
--- a/source/blender/editors/gpencil/gpencil_add_stroke.c
+++ b/source/blender/editors/gpencil/gpencil_add_stroke.c
@@ -225,8 +225,8 @@ void ED_gpencil_create_stroke(bContext *C, Object *ob, float mat[4][4])
   ob->actcol = color_black + 1;
 
   /* layers */
-  bGPDlayer *colors = BKE_gpencil_layer_addnew(gpd, "Colors", false);
-  bGPDlayer *lines = BKE_gpencil_layer_addnew(gpd, "Lines", true);
+  bGPDlayer *colors = BKE_gpencil_layer_addnew(gpd, "Colors", false, false);
+  bGPDlayer *lines = BKE_gpencil_layer_addnew(gpd, "Lines", true, false);
 
   /* frames */
   bGPDframe *frame_color = BKE_gpencil_frame_addnew(colors, CFRA);
diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c
index ac75ae44c8a..8ab413e907c 100644
--- a/source/blender/editors/gpencil/gpencil_convert.c
+++ b/source/blender/editors/gpencil/gpencil_convert.c
@@ -1857,7 +1857,7 @@ static int image_to_gpencil_exec(bContext *C, wmOperator *op)
 
   /* Add layer and frame. */
   bGPdata *gpd = (bGPdata *)ob->data;
-  bGPDlayer *gpl = BKE_gpencil_layer_addnew(gpd, "Image Layer", true);
+  bGPDlayer *gpl = BKE_gpencil_layer_addnew(gpd, "Image Layer", true, false);
   bGPDframe *gpf = BKE_gpencil_frame_addnew(gpl, CFRA);
   done = BKE_gpencil_from_image(sima, gpd, gpf, size, is_mask);
 
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 6f727de0e47..1dd7f6fec30 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -129,7 +129,7 @@ static int gpencil_data_add_exec(bContext *C, wmOperator *op)
   gpd->flag |= GP_DATA_ANNOTATIONS;
 
   /* add new layer (i.e. a "note") */
-  BKE_gpencil_layer_addnew(*gpd_ptr, DATA_("Note"), true);
+  BKE_gpencil_layer_addnew(*gpd_ptr, DATA_("Note"), true, false);
 
   /* notifiers */
   WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
@@ -231,7 +231,7 @@ static int gpencil_layer_add_exec(bContext *C, wmOperator *op)
 
     /* mark as annotation */
     (*gpd_ptr)->flag |= GP_DATA_ANNOTATIONS;
-    BKE_gpencil_layer_addnew(*gpd_ptr, DATA_("Note"), true);
+    BKE_gpencil_layer_addnew(*gpd_ptr, DATA_("Note"), true, false);
     gpd = *gpd_ptr;
   }
   else {
@@ -239,7 +239,7 @@ static int gpencil_layer_add_exec(bContext *C, wmOperator *op)
     Object *ob = CTX_data_active_object(C);
     if ((ob != NULL) && (ob->type == OB_GPENCIL)) {
       gpd = (bGPdata *)ob->data;
-      bGPDlayer *gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true);
+      bGPDlayer *gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true, false);
       /* Add a new frame to make it visible in Dopesheet. */
       if (gpl != NULL) {
         gpl->actframe = BKE_gpencil_layer_frame_get(gpl, CFRA, GP_GETFRAME_ADD_NEW);
@@ -524,7 +524,6 @@ enum {
 
 static bool gpencil_layer_duplicate_object_poll(bContext *C)
 {
-  ViewLayer *view_layer = CTX_data_view_layer(C);
   Object *ob = CTX_data_active_object(C);
   if ((ob == NULL) || (ob->type != OB_GPENCIL)) {
     return false;
@@ -537,99 +536,75 @@ static bool gpencil_layer_duplicate_object_poll(bContext *C)
     return false;
   }
 
-  /* check there are more grease pencil objects */
-  LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
-    if ((base->object != ob) && (base->object->type == OB_GPENCIL)) {
-      return true;
-    }
-  }
-
-  return false;
+  return true;
 }
 
 static int gpencil_layer_duplicate_object_exec(bContext *C, wmOperator *op)
 {
   Main *bmain = CTX_data_main(C);
-  Scene *scene = CTX_data_scene(C);
-  char name[MAX_ID_NAME - 2];
-  RNA_string_get(op->ptr, "object", name);
-
-  if (name[0] == '\0') {
-    return OPERATOR_CANCELLED;
-  }
   const bool only_active = RNA_boolean_get(op->ptr, "only_active");
-
-  Object *ob_dst = (Object *)BKE_scene_object_find_by_name(scene, name);
-
-  int mode = RNA_enum_get(op->ptr, "mode");
+  const int mode = RNA_enum_get(op->ptr, "mode");
 
   Object *ob_src = CTX_data_active_object(C);
   bGPdata *gpd_src = (bGPdata *)ob_src->data;
   bGPDlayer *gpl_active = BKE_gpencil_layer_active_get(gpd_src);
 
-  /* Sanity checks. */
-  if (ELEM(NULL, gpd_src, ob_dst)) {
-    return OPERATOR_CANCELLED;
-  }
-  /* Cannot copy itself and check destination type. */
-  if ((ob_src == ob_dst) || (ob_dst->type != OB_GPENCIL)) {
-    return OPERATOR_CANCELLED;
-  }
-
-  bGPdata *gpd_dst = (bGPdata *)ob_dst->data;
-  /* Disable destination active layer to keep order. */
-  LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd_dst->layers) {
-    gpl->flag &= ~GP_LAYER_ACTIVE;
-  }
-
-  LISTBASE_FOREACH (bGPDlayer *, gpl_src, &gpd_src->layers) {
-    if ((only_active) && (gpl_src != gpl_active)) {
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    if ((ob == ob_src) || (ob->type != OB_GPENCIL)) {
       continue;
     }
-    /* Create new layer. */
-    bGPDlayer *gpl_dst = BKE_gpencil_layer_addnew(gpd_dst, gpl_src->info, true);
-    /* Need to copy some variables (not all). */
-    gpl_dst->onion_flag = gpl_src->onion_flag;
-    gpl_dst->thickness = gpl_src->thickness;
-    gpl_dst->line_change = gpl_src->line_change;
-    copy_v4_v4(gpl_dst->tintcolor, gpl_src->tintcolor);
-    gpl_dst->opacity = gpl_src->opacity;
-
-    /* Create all frames. */
-    LISTBASE_FOREACH (bGPDframe *, gpf_src, &gpl_src->frames) {
-
-      if ((mode == GP_LAYER_COPY_OBJECT_ACT_FRAME) && (gpf_src != gpl_src->actframe)) {
+    bGPdata *gpd_dst = (bGPdata *)ob->data;
+    LISTBASE_FOREACH_BACKWARD (bGPDlayer *, gpl_src, &gpd_src->layers) {
+      if ((only_active) && (gpl_src != gpl_active)) {
         continue;
       }
+      /* Create new layer (adding at head of the list). */
+      bGPDlayer *gpl_dst = BKE_gpencil_layer_addnew(gpd_dst, gpl_src->info, true, true);
+      /* Need to copy some variables (not all). */
+      gpl_dst->onion_flag = gpl_src->onion_flag;
+      gpl_dst->thickness = gpl_src->thickness;
+      gpl_dst->line_change = gpl_src->line_change;
+      copy_v4_v4(gpl_dst->tintcolor, gpl_src->tintcolor);
+      gpl_dst->opacity = gpl_src->opacity;
+
+      /* Create all frames. */
+      LISTBASE_FOREACH (bGPDframe *, gpf_src, &gpl_src->frames) {
+
+        if ((mode == GP_LAYER_COPY_OBJECT_ACT_FRAME) && (gpf_src != gpl_src->actframe)) {
+          continue;
+        }
 
-      /* Create new frame. */
-      bGPDframe *gpf_dst = BKE_gpencil_frame_addnew(gpl_dst, gpf_src->framenum);
+        /* Create new frame. */
+        bGPDframe *gpf_dst = BKE_gpencil_frame_addnew(gpl_dst, gpf_src->framenum);
 
-      /* Copy strokes. */
-      LISTBASE_FOREACH (bGPDstroke *, gps_src, &gpf_src->strokes) {
+        /* Copy strokes. */
+        LISTBASE_FOREACH (bGPDstroke *, gps_src, &gpf_src->strokes) {
 
-        /* Make copy of source stroke. */
-        bGPDstroke *gps_dst = BKE_gpencil_stroke_duplicate(gps_src, true, true);
+          /* Make copy of source stroke. */
+          bGPDstroke *gps_dst = BKE_gpencil_stroke_duplicate(gps_src, true, true);
 
-        /* Check if material is in destination object,
-         * otherwise add the slot with the material. */
-        Material *ma_src = BKE_object_material_get(ob_src, gps_src->mat_nr + 1);
-        if (ma_src != NULL) {
-          int idx = BKE_gpencil_object_material_ensure(bmain, ob_dst, ma_src);
+          /* Check if material is in destination object,
+           * otherwise add the slot with the material. */
+          Material *ma_src = BKE_object_material_get(ob_src, gps_src->mat_nr + 1);
+          if (ma_src != NULL) {
+            int idx = BKE_gpencil_object_material_ensure(bmain, ob, ma_src);
 
-          /* Reassign the stroke material to the right slot in destination object. */
-          gps_dst->mat_nr = idx;
-        }
+            /* Reassign the stroke material to the right slot in destination object. */
+            gps_dst->mat_nr = idx;
+          }
 
-        /* Add new stroke to frame. */
-        BLI_addtail(&gpf_dst->strokes, gps_dst);
+          /* Add new stroke to frame. */
+          BLI_addtail(&gpf_dst->strokes, gps_dst);
+        }
       }
     }
+    /* notifiers */
+    DEG_id_tag_update(&gpd_dst->id,
+                      ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
+    DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE);
   }
-  /* notifiers */
-  DEG_id_tag_update(&gpd_dst->id,
-                    ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
-  DEG_id_tag_update(&ob_dst->id, ID_RECALC_COPY_ON_WRITE);
+  CTX_DATA_END;
+
   WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 
   return OPERATOR_FINISHED;
@@ -648,7 +623,7 @@ void GPENCIL_OT_layer_duplicate_object(wmOperatorType *ot)
   /* identifiers */
   ot->name = "Duplicate Layer to New Object";
   ot->idname = "GPENCIL_OT_layer_duplicate_object";
-  ot->description = "Make a copy of the active Grease Pencil layer to new object";
+  ot->description = "Make a copy of the active Grease Pencil layer to selected object";
 
   /* callbacks */
   ot->exec = gpencil_layer_duplicate_object_exec;
@@ -657,17 +632,11 @@ void GPENCIL_OT_layer_duplicate_object(wmOperatorType *ot)
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-  ot->prop = RNA_def_string(
-      ot->srna, "object", NULL, MAX_ID_NAME - 2, "Object", "Name of the destination object");
-  RNA_def_property_flag(ot->prop, PROP_HIDDEN | PROP_SKIP_SAVE);
-
-  RNA_def_enum(ot->srna, "mode", copy_mode, GP_LAYER_COPY_OBJECT_ALL_FRAME, "Mode", "");
-
   prop = RNA_def_boolean(ot->srna,
                          "only_active",
                          true,
                          "Only Active",
-                         "Append only active Layer, uncheck to append all layers");
+                         "Copy only active Layer, uncheck to append all layers");
   RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }
 
@@ -1461,7 +1430,7 @@ static int gpencil_layer_change_exec(bContext *C, wmOperator *op)
   /* Get layer or create new one */
   if (layer_num == -1) {
     /* Create layer */
-    gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true);
+    gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true, false);
   }
   else {
     /* Try to get layer */
@@ -3608,9 +3577,8 @@ void GPENCIL_OT_set_active_material(wmOperatorType *ot)
 }
 
 /* ********************* Append Materials in a new object ************************** */
-static bool gpencil_materials_append_to_object_poll(bContext *C)
+static bool gpencil_materials_copy_to_object_poll(bContext *C)
 {
-  ViewLayer *view_layer = CTX_data_view_layer(C);
   Object *ob = CTX_data_active_object(C);
   if ((ob == NULL) || (ob->type != OB_GPENCIL)) {
     return false;
@@ -3620,85 +3588,64 @@ static bool gpencil_materials_append_to_object_poll(bContext *C)
     return false;
   }
 
-  /* check there are more grease pencil objects */
-  LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
-    if ((base->object != ob) && (base->object->type == OB_GPENCIL)) {
-      return true;
-    }
-  }
-
-  return false;
+  return true;
 }
 
-static int gpencil_materials_append_to_object_exec(bContext *C, wmOperator *op)
+static int gpencil_materials_copy_to_object_exec(bContext *C, wmOperator *op)
 {
   Main *bmain = CTX_data_main(C);
-  Scene *scene = CTX_data_scene(C);
-  char name[MAX_ID_NAME - 2];
-  RNA_string_get(op->ptr, "object", name);
-
-  if (name[0] == '\0') {
-    return OPERATOR_CANCELLED;
-  }
-  const bool only_selected = RNA_boolean_get(op->ptr, "only_selected");
-
-  Object *ob_dst = (Object *)BKE_scene_object_find_by_name(scene, name);
+  const bool only_active = RNA_boolean_get(op->ptr, "only_active");
   Object *ob_src = CTX_data_active_object(C);
   Material *ma_active = BKE_gpencil_material(ob_src, ob_src->actcol);
 
-  /* Sanity checks. */
-  if (ELEM(NULL, ob_src, ob_dst)) {
-    return OPERATOR_CANCELLED;
-  }
-  /* Cannot copy itself and check destination type. */
-  if ((ob_src == ob_dst) || (ob_dst->type != OB_GPENCIL)) {
-    return OPERATOR_CANCELLED;
-  }
-
-  /* Duplicate materials. */
-  for (int i = 0; i < ob_src->totcol; i++) {
-    Material *ma_src = BKE_object_material_get(ob_src, i + 1);
-    if (only_selected && ma_src != ma_active) {
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    if ((ob == ob_src) || (ob->type != OB_GPENCIL)) {
       continue;
     }
+    /* Duplicate materials. */
+    for (int i = 0; i < ob_src->totcol; i++) {
+      Material *ma_src = BKE_object_material_get(ob_src, i + 1);
+      if (only_active && ma_src != ma_active) {
+        continue;
+      }
 
-    if (ma_src != NULL) {
-      BKE_gpencil_object_material_ensure(bmain, ob_dst, ma_src);
+      if (ma_src != NULL) {
+        BKE_gpencil_object_material_ensure(bmain, ob, ma_src);
+      }
     }
+
+    /* notifiers */
+    DEG_id_tag_update(&ob->id, ID_RECALC_COPY_ON_WRITE);
   }
+  CTX_DATA_END;
 
   /* notifiers */
-  DEG_id_tag_update(&ob_dst->id, ID_RECALC_COPY_ON_WRITE);
   WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 
   return OPERATOR_FINISHED;
 }
 
-void GPENCIL_OT_materials_append_to_object(wmOperatorType *ot)
+void GPENCIL_OT_materials_copy_to_object(wmOperatorType *ot)
 {
   PropertyRNA *prop;
 
   /* identifiers */
-  ot->name = "Append Materials to New Object";
-  ot->idname = "GPENCIL_OT_materials_append_to_object";
+  ot->name = "Copy Materials to Selected Object";
+  ot->idname = "GPENCIL_OT_materials_copy_to_object";
   ot->description = "Append Materials of the active Grease Pencil to other object";
 
   /* callbacks */
-  ot->exec = gpencil_materials_append_to_object_exec;
-  ot->poll = gpencil_materials_append_to_object_poll;
+  ot->exec = gpencil_materials_copy_to_object_exec;
+  ot->poll = gpencil_materials_copy_to_object_poll;
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-  ot->prop = RNA_def_string(
-      ot->srna, "object", NULL, MAX_ID_NAME - 2, "Object", "Name of the destination object");
-  RNA_def_property_flag(ot->prop, PROP_HIDDEN | PROP_SKIP_SAVE);
-
   prop = RNA_def_boolean(ot->srna,
-                         "only_selected",
+                         "only_active",
                          true,
-                         "Only Selected",
-                         "Append only selected material, uncheck to append all materials");
+                         "Only Active",
+                         "Append only active material, uncheck to append all materials");
   RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 }
 
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d90f74fbf4f..dde8d31492a 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1677,7 +1677,7 @@ static int gpencil_strokes_paste_exec(bContext *C, wmOperator *op)
 
   if (gpl == NULL) {
     /* no active layer - let's just create one */
-    gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true);
+    gpl = BKE_gpencil_layer_addnew(gpd, DATA_("GP_Layer"), true, false);
   }
   else if ((BKE_gpencil_layer_is_editable(gpl) == false) && (type == GP_COPY_TO_ACTIVE)) {
     BKE_report(
@@ -1835,7 +1835,7 @@ static int gpencil_move_to_layer_exec(bContext *C, wmOperator *op)
   }
   else {
     /* Create a new layer. */
-    target_layer = BKE_gpencil_layer_addnew(gpd, "GP_Layer", true);
+    target_layer = BKE_gpencil_layer_addnew(gpd, "GP_Layer", true, false);
   }
 
   if (target_layer == NULL) {
@@ -4600,7 +4600,7 @@ static int gpencil_stroke_separate_exec(bContext *C, wmOperator *op)
             if (gps->flag & GP_STROKE_SELECT) {
               /* add layer if not created before */
               if (gpl_dst == NULL) {
-                gpl_dst = BKE_gpencil_layer_addnew(gpd_dst, gpl->info, false);
+                gpl_dst = BKE_gpencil_layer_addnew(gpd_dst, gpl->info, false, false);
               }
 
               /* add frame if not created before */
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 62d64c67b08..f74e211dd65 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -1689,7 +1689,7 @@ static tGPDfill *gpencil_session_init_fill(bContext *C, wmOperator *op)
   tgpf->gpd = gpd;
   tgpf->gpl = BKE_gpencil_layer_active_get(gpd);
   if (tgpf->gpl == NULL) {
-    tgpf->gpl = BKE_gpencil_layer_addnew(tgpf->gpd, DATA_("GP_Layer"), true);
+    tgpf->gpl = BKE_gpencil_layer_addnew(tgpf->gpd, DATA_("GP_Layer"), true, false);
   }
 
   tgpf->lock_axis = ts->gp_sculpt.lock_axis;
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index cce56acd3e4..9f48c81c8f1 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -538,7 +538,7 @@ void GPENCIL_OT_material_lock_unused(struct wmOperatorType *ot);
 void GPENCIL_OT_material_select(struct wmOperatorType *ot);
 void GPENCIL_OT_material_set(struct wmOperatorType *ot);
 void GPENCIL_OT_set_active_material(struct wmOperatorType *ot);
-void GPENCIL_OT_materials_append_to_object(struct wmOperatorType *ot);
+void GPENCIL_OT_materials_copy_to_object(struct wmOperatorType *ot);
 
 /* convert old 2.7 files to 2.8 */
 void GPENCIL_OT_convert_old_files(struct wmOperatorType *ot);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index 6ac1161bff8..698d784c3b0 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -651,7 +651,7 @@ void ED_operatortypes_gpencil(void)
 
   WM_operatortype_append(GPENCIL_OT_material_to_vertex_color);
   WM_operatortype_append(GPENCIL_OT_extract_palette_vertex);
-  WM_operatortype_append(GPENCIL_OT_materials_append_to_object);
+  WM_operatortype_append(GPENCIL_OT_materials_copy_to_object);
 
   WM_operatortype_append(GPENCIL_OT_transform_fill);
   WM_operatortype_append(GPENCIL_OT_reset_transform_fill);
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 9bd929aa2af..30d85b09974 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2120,7 +2120,7 @@ static void gpencil_paint_initstroke(tGPsdata *p,
   /* get active layer (or add a new one if non-existent) */
   p->gpl = BKE_gpencil_layer_active_get(p->gpd);
   if (p->gpl == NULL) {
-    p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("GP_Layer"), true);
+    p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("GP_Layer"), true, false);
     changed = true;
     if (p->custom_color[3]) {
       copy_v3_v3(p->gpl->color, p->custom_color);
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 3d20e32ed49..1b0a40b1be1 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -314,7 +314,7 @@ static void gpencil_primitive_set_initdata(bContext *C, tGPDprimitive *tgpi)
 
   /* if layer doesn't exist, create a new one */
   if (gpl == NULL) {
-    gpl = BKE_gpencil_layer_addnew(tgpi->gpd, DATA_("Primitives"), true);
+    gpl = BKE_gpencil_layer_addnew(tgpi->gpd, DATA_("Primitives"), true, false);
   }
   tgpi->gpl = gpl;
 
diff --git a/source/blender/editors/gpencil/gpencil_trace_ops.c b/source/blender/editors/gpencil/gpencil_trace_ops.c
index d2e5fa3db32..cd75f9313ad 100644
--- a/source/blender/editors/gpencil/gpencil_trace_ops.c
+++ b/source/blender/editors/gpencil/gpencil_trace_ops.c
@@ -207,7 +207,7 @@ static void trace_initialize_job_data(TraceJob *trace_job)
   trace_job->gpd = (bGPdata *)trace_job->ob_gpencil->data;
   trace_job->gpl = BKE_gpencil_layer_active_get(trace_job->gpd);
   if (trace_job->gpl == NULL) {
-    trace_job->gpl = BKE_gpencil_layer_addnew(trace_job->gpd, DATA_("Trace"), true);
+    trace_job->gpl = BKE_gpencil_layer_addnew(trace_job->gpd, DATA_("Trace"), true, false);
   }
 }