[Bf-blender-cvs] [f4d4f502122] blender2.8: UI: move gpencil paint into topbar only layout

[Campbell Barton]

Commit: f4d4f502122aaf7df65cc8d3beeb86a9f444712b
Author: Campbell Barton
Date:   Tue Nov 13 20:59:25 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBf4d4f502122aaf7df65cc8d3beeb86a9f444712b

UI: move gpencil paint into topbar only layout

Tool properties were duplicating UI elements.

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 3fa27bd4d26..cea897ae8e9 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1384,22 +1384,6 @@ class _defs_gpencil_edit:
 
 class _defs_gpencil_sculpt:
 
-    def draw_settings_common(context, layout, tool):
-        tool_settings = context.tool_settings
-        settings = tool_settings.gpencil_sculpt
-        tool = settings.sculpt_tool
-        brush = settings.brush
-
-        layout.prop(brush, "size", slider=True)
-
-        row = layout.row(align=True)
-        row.prop(brush, "strength", slider=True)
-        row.prop(brush, "use_pressure_strength", text="")
-
-        if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
-            row.separator()
-            row.prop(brush, "direction", expand=True, text="")
-
     @staticmethod
     def generate_from_brushes(context):
         return generate_from_enum_ex(
@@ -1407,24 +1391,11 @@ class _defs_gpencil_sculpt:
             icon_prefix="ops.gpencil.sculpt_",
             type=bpy.types.GPencilSculptSettings,
             attr="sculpt_tool",
-            tooldef_keywords={
-                "draw_settings": _defs_gpencil_sculpt.draw_settings_common,
-            },
         )
 
 
 class _defs_gpencil_weight:
 
-    def draw_settings_common(context, layout, tool):
-        settings = context.tool_settings.gpencil_sculpt
-        brush = settings.brush
-
-        layout.prop(brush, "size", slider=True)
-
-        row = layout.row(align=True)
-        row.prop(brush, "strength", slider=True)
-        row.prop(brush, "use_pressure_strength", text="")
-
     @staticmethod
     def generate_from_brushes(context):
         return generate_from_enum_ex(
@@ -1432,9 +1403,6 @@ class _defs_gpencil_weight:
             icon_prefix="ops.gpencil.sculpt_",
             type=bpy.types.GPencilSculptSettings,
             attr="weight_tool",
-            tooldef_keywords={
-                "draw_settings": _defs_gpencil_weight.draw_settings_common,
-            },
         )
 
 
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index ac6bd4002ca..5d2e98bdd8a 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -368,6 +368,39 @@ class _draw_left_context_mode:
 
                 draw_color_selector()
 
+        @staticmethod
+        def GPENCIL_SCULPT(context, layout, tool):
+            if (tool is None) or (not tool.has_datablock):
+                return
+            tool_settings = context.tool_settings
+            settings = tool_settings.gpencil_sculpt
+            tool = settings.sculpt_tool
+            brush = settings.brush
+
+            layout.prop(brush, "size", slider=True)
+
+            row = layout.row(align=True)
+            row.prop(brush, "strength", slider=True)
+            row.prop(brush, "use_pressure_strength", text="")
+
+            if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
+                row.separator()
+                row.prop(brush, "direction", expand=True, text="")
+
+        @staticmethod
+        def GPENCIL_WEIGHT(context, layout, tool):
+            if (tool is None) or (not tool.has_datablock):
+                return
+            tool_settings = context.tool_settings
+            settings = tool_settings.gpencil_sculpt
+            brush = settings.brush
+
+            layout.prop(brush, "size", slider=True)
+
+            row = layout.row(align=True)
+            row.prop(brush, "strength", slider=True)
+            row.prop(brush, "use_pressure_strength", text="")
+
         @staticmethod
         def PARTICLE(context, layout, tool):
             # See: 'VIEW3D_PT_tools_brush', basically a duplicate