From b72e81bfd0d687fbe4bf19f56366ec8a7d71fa2e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 29 Aug 2018 15:45:51 +1000 Subject: [PATCH] UI: refactor particle panel/topbar logic Similar logic for panel & topbar, use same checks. --- release/scripts/startup/bl_ui/space_topbar.py | 16 +++++++-------- .../startup/bl_ui/space_view3d_toolbar.py | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 8bafa3805b2..c02e57f67e0 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -233,18 +233,18 @@ class _draw_left_context_mode: layout.prop(brush, "size", slider=True) if tool == 'ADD': layout.prop(brush, "count") - else: - layout.prop(brush, "strength", slider=True) - if tool == 'ADD': layout.prop(settings, "use_default_interpolate") layout.prop(brush, "steps", slider=True) layout.prop(settings, "default_key_count", slider=True) - elif tool == 'LENGTH': - layout.row().prop(brush, "length_mode", expand=True) - elif tool == 'PUFF': - layout.row().prop(brush, "puff_mode", expand=True) - layout.prop(brush, "use_puff_volume") + else: + layout.prop(brush, "strength", slider=True) + + if tool == 'LENGTH': + layout.row().prop(brush, "length_mode", expand=True) + elif tool == 'PUFF': + layout.row().prop(brush, "puff_mode", expand=True) + layout.prop(brush, "use_puff_volume") class INFO_MT_editor_menus(Menu): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 25c7ff8cac7..07da601f7ee 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -295,19 +295,19 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): col.prop(brush, "size", slider=True) if tool == 'ADD': col.prop(brush, "count") + + col = layout.column() + col.prop(settings, "use_default_interpolate") + col.prop(brush, "steps", slider=True) + col.prop(settings, "default_key_count", slider=True) else: col.prop(brush, "strength", slider=True) - if tool == 'ADD': - col = layout.column() - col.prop(settings, "use_default_interpolate") - col.prop(brush, "steps", slider=True) - col.prop(settings, "default_key_count", slider=True) - elif tool == 'LENGTH': - layout.row().prop(brush, "length_mode", expand=True) - elif tool == 'PUFF': - layout.row().prop(brush, "puff_mode", expand=True) - layout.prop(brush, "use_puff_volume") + if tool == 'LENGTH': + layout.row().prop(brush, "length_mode", expand=True) + elif tool == 'PUFF': + layout.row().prop(brush, "puff_mode", expand=True) + layout.prop(brush, "use_puff_volume") # Sculpt Mode #