kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: don't disable snap popover in topbar

Browse Source 
Snap settings still apply when transforming (holding Ctrl)

Also no need to prevent proportional edit menu from opening,
showing inactive is enough.
This commit is contained in:
Campbell Barton 2018-05-19 16:22:42 +02:00
parent d3c89f50a0
commit 7cbf5db248
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -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',