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:
authorPhilipp Oeser <info@graphics-engineer.com>2020-02-20 18:45:33 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-02-27 11:56:02 +0300
commitf38c54d56ef5d7a4a02982c004509d66d9a9e55d (patch)
treeb469c0d05130380af50ed05aa521510ef864d846
parent80684ca41c52bce394fef81d3e70a2a9e14f661a (diff)
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
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py21
1 files changed, 19 insertions, 2 deletions
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)