[Bf-blender-cvs] [7e082735ac6] greasepencil-object: GPencil: Replace Options menu with old menus

[Antonio Vazquez]

Commit: 7e082735ac6b367b2c67b0b99ec3e4a35e7481b9
Author: Antonio Vazquez
Date:   Sun Mar 1 16:25:00 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7e082735ac6b367b2c67b0b99ec3e4a35e7481b9

GPencil: Replace Options menu with old menus

Add the options to existing menu.

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d.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 08df7bad82c..f49e926795b 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -341,7 +341,7 @@ class GPENCIL_MT_move_to_layer(Menu):
 
 
 class GPENCIL_MT_layer_active(Menu):
-    bl_label = "Active Layer"
+    bl_label = "Change Active Layer"
 
     def draw(self, context):
         layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 4f1c1cb6f89..232bd504c0a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4675,6 +4675,10 @@ class VIEW3D_MT_paint_gpencil(Menu):
 
         layout = self.layout
 
+        layout.menu("GPENCIL_MT_layer_active")
+
+        layout.separator()
+
         layout.menu("VIEW3D_MT_gpencil_animation")
         layout.menu("VIEW3D_MT_edit_gpencil_interpolate")
 
@@ -4780,6 +4784,7 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
         layout.separator()
 
         layout.menu("GPENCIL_MT_move_to_layer")
+        layout.menu("GPENCIL_MT_layer_active")
         layout.menu("VIEW3D_MT_assign_material")
         layout.operator("gpencil.set_active_material", text="Set as Active Material")
         layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes")