[Bf-blender-cvs] [2af322f3ba6] greasepencil-object: UI: Back Selected Mask options to Topbar

[Antonio Vazquez]

Commit: 2af322f3ba6f0cfc6febc72e9b555d98fe9b646c
Author: Antonio Vazquez
Date:   Fri Jul 6 16:55:16 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2af322f3ba6f0cfc6febc72e9b555d98fe9b646c

UI: Back Selected Mask options to Topbar

These options aren't overlays.

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

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 16f8aacf02a..c350f509670 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -122,6 +122,11 @@ class VIEW3D_HT_header(Header):
                 row.operator("gpencil.copy", text="", icon='COPYDOWN')
                 row.operator("gpencil.paste", text="", icon='PASTEDOWN')
 
+            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
+                row = layout.row(align=True)
+                row.prop(tool_settings.gpencil_sculpt, "use_select_mask")
+                row.prop(tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
+
             if gpd.is_stroke_paint_mode:
                 row = layout.row(align=True)
                 row.operator("gpencil.colorpick", text="Colors", icon="GROUP_VCOL")
@@ -4257,11 +4262,6 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
             col.prop(gpd, "show_edit_lines", text="Show Edit Lines")
             col.prop(gpd, "edit_line_color", text="Edit Line Color")
 
-        if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode:
-            col.prop(tool_settings.gpencil_sculpt, "use_select_mask")
-            col.prop(tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
-
-
 
 class VIEW3D_PT_overlay_gpencil_paper(Panel):
     bl_space_type = 'VIEW_3D'