UI: move gpencil paint into topbar only layout

Tool properties were duplicating UI elements.

1 files changed, 33 insertions, 0 deletions

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
@@ -369,6 +369,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
             settings = context.tool_settings.particle_edit