[Bf-blender-cvs] [a99e1afae0c] greasepencil-object: GPencil: Add merge materials to Cleanup menu

[Antonio Vazquez]

Commit: a99e1afae0cd2a5e5185bc9eca6d3c2795143658
Author: Antonio Vazquez
Date:   Wed Oct 30 22:51:50 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa99e1afae0cd2a5e5185bc9eca6d3c2795143658

GPencil: Add merge materials to Cleanup menu

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 1a7c239a9cc..08bfee8a1a2 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -646,6 +646,10 @@ class GPENCIL_MT_cleanup(Menu):
         layout.operator("gpencil.frame_clean_fill", text="Boundary Strokes").mode = 'ACTIVE'
         layout.operator("gpencil.frame_clean_fill", text="Boundary Strokes all Frames").mode = 'ALL'
 
+        layout.separator()
+
+        layout.operator("gpencil.stroke_merge_material", text="Merge Materials")
+
         if ob.mode != 'PAINT_GPENCIL':
             layout.separator()