From 7cbf5db24851248389555a518b49f105b880cbb9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 May 2018 16:22:42 +0200 Subject: [PATCH] UI: don't disable snap popover in topbar Snap settings still apply when transforming (holding Ctrl) Also no need to prevent proportional edit menu from opening, showing inactive is enough. --- release/scripts/startup/bl_ui/space_topbar.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 69afa0da12e..3683eea9128 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -217,21 +217,21 @@ class TOPBAR_HT_lower_bar(Header): row.prop(toolsettings, "proportional_edit", icon_only=True) sub = row.row(align=True) - sub.enabled = toolsettings.proportional_edit != 'DISABLED' + sub.active = toolsettings.proportional_edit != 'DISABLED' sub.prop(toolsettings, "proportional_edit_falloff", icon_only=True) elif object_mode in {'EDIT', 'PARTICLE_EDIT'}: row = layout.row(align=True) row.prop(toolsettings, "proportional_edit", icon_only=True) sub = row.row(align=True) - sub.enabled = toolsettings.proportional_edit != 'DISABLED' + sub.active = toolsettings.proportional_edit != 'DISABLED' sub.prop(toolsettings, "proportional_edit_falloff", icon_only=True) elif object_mode == 'OBJECT': row = layout.row(align=True) row.prop(toolsettings, "use_proportional_edit_objects", icon_only=True) sub = row.row(align=True) - sub.enabled = toolsettings.use_proportional_edit_objects + sub.active = toolsettings.use_proportional_edit_objects sub.prop(toolsettings, "proportional_edit_falloff", icon_only=True) else: # Proportional editing @@ -239,7 +239,7 @@ class TOPBAR_HT_lower_bar(Header): row = layout.row(align=True) row.prop(toolsettings, "proportional_edit", icon_only=True) sub = row.row(align=True) - sub.enabled = toolsettings.proportional_edit != 'DISABLED' + sub.active = toolsettings.proportional_edit != 'DISABLED' sub.prop(toolsettings, "proportional_edit_falloff", icon_only=True) # Snap @@ -267,7 +267,6 @@ class TOPBAR_HT_lower_bar(Header): row.prop(toolsettings, "use_snap", text="") sub = row.row(align=True) - sub.enabled = toolsettings.use_snap sub.popover( space_type='TOPBAR', region_type='HEADER',