Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-19 17:22:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-19 17:23:54 +0300
commit7cbf5db24851248389555a518b49f105b880cbb9 (patch)
tree22f6a2bfa2958c0ce43ca3d66b4b231a865fc3bb /release
parentd3c89f50a0167cb978daf3eda064bc7f36167de8 (diff)
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.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_topbar.py9
1 files 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',