GPencil: New Append operators

Now it's possible to append materials of one grease pencil object into another one. The operator allows active material or all materials.

Also, the Layer Copy To Object has been renamed to Layer Append to Object to keep consistency and now allows to append all layers at once.

3 files changed, 74 insertions, 19 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 69720a6c54b..d88c9a3502d 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -113,7 +113,8 @@ class GPENCIL_MT_layer_context_menu(Menu):
         layout.operator("gpencil.layer_merge", icon='SORT_ASC', text="Merge Down")
 
         layout.separator()
-        layout.menu("VIEW3D_MT_gpencil_copy_layer")
+        layout.menu("VIEW3D_MT_gpencil_append_active_layer")
+        layout.menu("VIEW3D_MT_gpencil_append_all_layers")
 
 
 class DATA_PT_gpencil_layers(DataButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 6a5c000116f..ed5863b463a 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -53,6 +53,10 @@ class GPENCIL_MT_material_context_menu(Menu):
         layout.operator("gpencil.material_to_vertex_color", text="Convert Materials to Vertex Color")
         layout.operator("gpencil.extract_palette_vertex", text="Extract Palette from Vertex Color")
 
+        layout.separator()
+        layout.menu("VIEW3D_MT_gpencil_append_active_material")
+        layout.menu("VIEW3D_MT_gpencil_append_all_materials")
+
 
 class GPENCIL_UL_matslots(UIList):
     def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index bdc924e3197..4b06a2df3a0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4956,26 +4956,73 @@ class VIEW3D_MT_assign_material(Menu):
                                 icon='LAYER_ACTIVE' if mat == mat_active else 'BLANK1').material = mat.name
 
 
-class VIEW3D_MT_gpencil_copy_layer(Menu):
-    bl_label = "Copy Layer to Object"
+def gpencil_layer_append_menu_items(context, layout, only_active):
+    done = False
+    view_layer = context.view_layer
+    obact = context.active_object
+    gpl = context.active_gpencil_layer
+
+    done = False
+    if gpl is not None:
+        for ob in view_layer.objects:
+            if ob.type == 'GPENCIL' and ob != obact:
+                op = layout.operator("gpencil.layer_duplicate_object", text=ob.name)
+                op.object = ob.name
+                op.only_active = only_active
+                done = True
+
+        if done is False:
+            layout.label(text="No destination object", icon='ERROR')
+    else:
+        layout.label(text="No layer to copy", icon='ERROR')
+
+
+class VIEW3D_MT_gpencil_append_active_layer(Menu):
+    bl_label = "Append Active Layer to Object"
 
     def draw(self, context):
         layout = self.layout
-        view_layer = context.view_layer
-        obact = context.active_object
-        gpl = context.active_gpencil_layer
-
-        done = False
-        if gpl is not None:
-            for ob in view_layer.objects:
-                if ob.type == 'GPENCIL' and ob != obact:
-                    layout.operator("gpencil.layer_duplicate_object", text=ob.name).object = ob.name
-                    done = True
-
-            if done is False:
-                layout.label(text="No destination object", icon='ERROR')
-        else:
-            layout.label(text="No layer to copy", icon='ERROR')
+        gpencil_layer_append_menu_items(context, layout, True)
+
+
+class VIEW3D_MT_gpencil_append_all_layers(Menu):
+    bl_label = "Append All Layers to Object"
+
+    def draw(self, context):
+        layout = self.layout
+        gpencil_layer_append_menu_items(context, layout, False)
+
+
+def gpencil_material_menu_items(context, layout, only_selected):
+    done = False
+    view_layer = context.view_layer
+    obact = context.active_object
+
+    for ob in view_layer.objects:
+        if ob.type == 'GPENCIL' and ob != obact:
+            op = layout.operator("gpencil.materials_append_to_object", text=ob.name)
+            op.object = ob.name
+            op.only_selected = only_selected
+            done = True
+
+    if done is False:
+        layout.label(text="No destination object", icon='ERROR')
+
+
+class VIEW3D_MT_gpencil_append_active_material(Menu):
+    bl_label = "Append Active Material to Object"
+
+    def draw(self, context):
+        layout = self.layout
+        gpencil_material_menu_items(context, layout, True)
+
+
+class VIEW3D_MT_gpencil_append_all_materials(Menu):
+    bl_label = "Append All Materials to Object"
+
+    def draw(self, context):
+        layout = self.layout
+        gpencil_material_menu_items(context, layout, False)
 
 
 class VIEW3D_MT_edit_gpencil(Menu):
@@ -7642,7 +7689,10 @@ classes = (
     VIEW3D_MT_weight_gpencil,
     VIEW3D_MT_gpencil_animation,
     VIEW3D_MT_gpencil_simplify,
-    VIEW3D_MT_gpencil_copy_layer,
+    VIEW3D_MT_gpencil_append_active_layer,
+    VIEW3D_MT_gpencil_append_all_layers,
+    VIEW3D_MT_gpencil_append_active_material,
+    VIEW3D_MT_gpencil_append_all_materials,
     VIEW3D_MT_gpencil_autoweights,
     VIEW3D_MT_gpencil_edit_context_menu,
     VIEW3D_MT_edit_curve,