[Bf-blender-cvs] [35a5fccf777] blender2.8: UI: show particle radius & strength in topbar

[Campbell Barton]

Commit: 35a5fccf777b52f4fe8cf84e82df7a9f43b188df
Author: Campbell Barton
Date:   Thu Aug 2 21:27:12 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB35a5fccf777b52f4fe8cf84e82df7a9f43b188df

UI: show particle radius & strength in topbar

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index ecb59e322c2..57265b9c130 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -224,6 +224,17 @@ class _draw_left_context_mode:
         UnifiedPaintPanel.prop_unified_size(layout, context, brush, "size", slider=True, text="Radius")
         UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength")
 
+    def PARTICLE(context, layout):
+        settings = context.tool_settings.particle_edit
+        brush = settings.brush
+        tool = settings.tool
+        if tool != 'NONE':
+            layout.prop(brush, "size", slider=True)
+            if tool == 'ADD':
+                layout.prop(brush, "count")
+            else:
+                layout.prop(brush, "strength", slider=True)
+
 
 class INFO_MT_editor_menus(Menu):
     bl_idname = "INFO_MT_editor_menus"
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index dd071f357af..ccec7ab941a 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -289,16 +289,21 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
         if context.particle_edit_object:
             tool = settings.tool
 
-            layout.column().prop(settings, "tool", expand=True)
 
-            if tool != 'NONE':
-                col = layout.column()
-                col.prop(brush, "size", slider=True)
-                if tool != 'ADD':
-                    col.prop(brush, "strength", slider=True)
+            if self.is_popover:
+                # Topbar shows these already.
+                pass
+            else:
+                if tool != 'NONE':
+                    layout.column().prop(settings, "tool", expand=True)
+                    col = layout.column()
+                    col.prop(brush, "size", slider=True)
+                    if tool == 'ADD':
+                        col.prop(brush, "count")
+                    else:
+                        col.prop(brush, "strength", slider=True)
 
             if tool == 'ADD':
-                col.prop(brush, "count")
                 col = layout.column()
                 col.prop(settings, "use_default_interpolate")
                 col.prop(brush, "steps", slider=True)