[Bf-blender-cvs] [3a61771fdc3] blender2.8: GP: Move mask button to header

[Antonioya]

Commit: 3a61771fdc31b1d659324f2c096709cf4fa94965
Author: Antonioya
Date:   Fri Sep 21 22:59:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3a61771fdc31b1d659324f2c096709cf4fa94965

GP: Move mask button to header

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 994e3e990bf..01ef60d73f2 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1405,9 +1405,6 @@ class _defs_gpencil_sculpt:
                 row.separator()
                 row.prop(brush, "direction", expand=True, text="")
 
-            row.separator()
-            row.prop(ts.gpencil_sculpt, "use_select_mask", text="")
-
     @ToolDef.from_fn
     def smooth():
         def draw_settings(context, layout, tool):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 85191454ee0..35e0ecea67e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -79,6 +79,11 @@ class VIEW3D_HT_header(Header):
 
             if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
                 row = layout.row(align=True)
+
+                if gpd.is_stroke_sculpt_mode:
+                    row.prop(tool_settings.gpencil_sculpt, "use_select_mask", text="")
+                    row.separator()
+
                 row.prop(gpd, "use_multiedit", text="", icon='FORCE_HARMONIC')
 
                 sub = row.row(align=True)