From 24ea6b713d7db459327cf2c62e8d596eebf74d59 Mon Sep 17 00:00:00 2001 From: William Reynish Date: Sun, 23 Feb 2020 16:52:43 +0100 Subject: UI: Remove Width/Percentage control from Bevel tool settings Since this control is set as you drag in the viewport anyway, this amount value is effectively useless. It was only recently added by mistake with the Bevel GSOC. --- release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py') diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index cd1fc49ac8b..2541613d1e6 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -608,15 +608,6 @@ class _defs_edit_mesh: region_type = context.region.type if not extra: - if props.offset_type == 'PERCENT': - layout.prop(props, "offset_pct") - else: - offset_text = "Width" - if props.offset_type == 'DEPTH': - offset_text = "Depth" - elif props.offset_type == 'OFFSET': - offset_text = "Offset" - layout.prop(props, "offset", text=offset_text) if region_type == 'TOOL_HEADER': layout.prop(props, "offset_type", text="") else: -- cgit v1.2.3 From f38c54d56ef5d7a4a02982c004509d66d9a9e55d Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 20 Feb 2020 16:45:33 +0100 Subject: Fix Vertex weight gradient tool show wrong weight/strength values in the UI Main issue is that the UI doesn not respect the Unified Weight/Strength setting (but instead alwasy shows the brushes weight/strength) Was working before, but somewhat missed in rBfb74dcc5d69d. See discussion in T74025 on why the Gradient Tool in its current state is not very user friendly in general, what I think we should do though is at least have the values in the UI respect Unified Weight / Unified Strength since this is what the tool will use internally... ref T74025 Maniphest Tasks: T74025 Differential Revision: https://developer.blender.org/D6900 --- .../startup/bl_ui/space_toolsystem_toolbar.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py') diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 2541613d1e6..d976de1762f 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1127,8 +1127,25 @@ class _defs_weight_paint: def draw_settings(context, layout, tool): brush = context.tool_settings.weight_paint.brush if brush is not None: - layout.prop(brush, "weight", slider=True) - layout.prop(brush, "strength", slider=True) + from bl_ui.properties_paint_common import UnifiedPaintPanel + UnifiedPaintPanel.prop_unified( + layout, + context, + brush, + "weight", + unified_name="use_unified_weight", + slider=True, + header=True + ) + UnifiedPaintPanel.prop_unified( + layout, + context, + brush, + "strength", + unified_name="use_unified_strength", + header=True + ) + props = tool.operator_properties("paint.weight_gradient") layout.prop(props, "type", expand=True) -- cgit v1.2.3 From 28fca2c588fdfb44919ec82eddab19d8cf2e8c9e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 28 Feb 2020 08:58:34 +1100 Subject: Docs: update the tool key-map docs, reference them from the toolbar --- release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py') diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index d976de1762f..2c79ceb5763 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -18,6 +18,9 @@ # +# For documentation on tool definitions: see "bl_ui.space_toolsystem_common.ToolDef" +# where there are comments for each field and their use. + # For now group all tools together # we may want to move these into per space-type files. # -- cgit v1.2.3