[Bf-blender-cvs] [52cf83d5a48] greasepencil-object: UI: Move "Move to Color" and "Select Strokes" operators from popup menu into the UI proper

[Joshua Leung]

Commit: 52cf83d5a481aea9a313c15c43abe69a6b9e9048
Author: Joshua Leung
Date:   Wed May 9 15:10:35 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB52cf83d5a481aea9a313c15c43abe69a6b9e9048

UI: Move "Move to Color" and "Select Strokes" operators from popup menu into the UI proper

This brings the GP materials UI more into line with the standard object materials UI

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/properties_material_gpencil.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 e6257f8f4fe..a8fc14d4b90 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -775,11 +775,6 @@ class GPENCIL_MT_color_specials(Menu):
 
         layout.separator()
 
-        layout.operator("gpencil.color_select", icon='COLOR', text="Select Strokes")
-        layout.operator("gpencil.stroke_change_color", icon='MAN_TRANS', text="Move to Color")
-
-        layout.separator()
-
         layout.operator("gpencil.stroke_lock_color", icon='BORDER_RECT', text="Lock Unselected")
         layout.operator("gpencil.lock_layer", icon='COLOR', text="Lock Unused")
 
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 7e975af71f1..132d98cd3e0 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -117,6 +117,12 @@ class MATERIAL_PT_gpencil_slots(Panel):
                 sub.operator("gpencil.color_isolate", icon='LOCKED', text="").affect_visibility = False
                 sub.operator("gpencil.color_isolate", icon='RESTRICT_VIEW_OFF', text="").affect_visibility = True
 
+            if gpd.use_stroke_edit_mode:
+                row = layout.row(align=True)
+                row.operator("gpencil.stroke_change_color", text="Assign")
+                row.operator("gpencil.color_select", text="Select")
+                #row.operator("gpencil.color_deselect", text="Deselect")
+
         split = layout.split(percentage=0.65)
 
         if ob: