[Bf-blender-cvs] [e133343e712] greasepencil-object: GPencil: New menu Select in Vertex Paint mode

[Antonio Vazquez]

Commit: e133343e712caec052263ea0b1e6f9e77a0dfb59
Author: Antonio Vazquez
Date:   Mon Nov 11 19:15:27 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe133343e712caec052263ea0b1e6f9e77a0dfb59

GPencil: New menu Select in Vertex Paint mode

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 930306a0fad..19a51588ac2 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -794,7 +794,7 @@ class VIEW3D_MT_editor_menus(Menu):
 
         # Select Menu
         if gp_edit:
-            if mode_string not in {'PAINT_GPENCIL', 'WEIGHT_GPENCIL', 'VERTEX_GPENCIL'}:
+            if mode_string not in {'PAINT_GPENCIL', 'WEIGHT_GPENCIL'}:
                 if mode_string == 'SCULPT_GPENCIL' and \
                     (ts.use_gpencil_select_mask_point or
                      ts.use_gpencil_select_mask_stroke or
@@ -802,6 +802,8 @@ class VIEW3D_MT_editor_menus(Menu):
                     layout.menu("VIEW3D_MT_select_gpencil")
                 elif mode_string == 'EDIT_GPENCIL':
                     layout.menu("VIEW3D_MT_select_gpencil")
+                elif mode_string == 'VERTEX_GPENCIL':
+                    layout.menu("VIEW3D_MT_select_gpencil")
         elif mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
             mesh = obj.data
             if mesh.use_paint_mask:
@@ -1827,6 +1829,12 @@ class VIEW3D_MT_select_gpencil(Menu):
         layout.operator("gpencil.select_more")
         layout.operator("gpencil.select_less")
 
+        if _context.mode == 'VERTEX_GPENCIL':
+            layout.separator()
+
+            layout.operator("gpencil.select_color")
+
+
 
 class VIEW3D_MT_select_paint_mask(Menu):
     bl_label = "Select"
@@ -4720,13 +4728,11 @@ class VIEW3D_MT_weight_gpencil(Menu):
 
 
 class VIEW3D_MT_vertex_gpencil(Menu):
-    bl_label = "Vertex Paint"
+    bl_label = "Paint"
 
     def draw(self, _context):
         layout = self.layout
 
-        layout.operator("gpencil.select_color", text="Select Color")
-
 
 class VIEW3D_MT_gpencil_animation(Menu):
     bl_label = "Animation"