From 6cab5abbc3f29adf4c39e043ccc84c89fdbd4d18 Mon Sep 17 00:00:00 2001 From: William Reynish Date: Fri, 8 Mar 2019 15:07:18 +0100 Subject: [PATCH] Tools: Re-order Weight Paint toolbar -Group gradient with the other paint tools -Nest the two Sample tools together -Keep painting tools first, secondary tools after -Make sure toolbar doesn't jump when selection is enabled --- .../scripts/startup/bl_ui/space_toolsystem_toolbar.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 31ea4b1d4b2..5e77d9c8fb9 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1728,20 +1728,22 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], 'PAINT_WEIGHT': [ - # TODO, check for mixed pose mode - _defs_view3d_generic.cursor, _defs_weight_paint.generate_from_brushes, + _defs_weight_paint.gradient, None, + ( _defs_weight_paint.sample_weight, _defs_weight_paint.sample_weight_group, + ), + None, + # TODO, check for mixed pose mode + _defs_view3d_generic.cursor, None, lambda context: ( VIEW3D_PT_tools_active._tools_select if _defs_weight_paint.poll_select_mask(context) else () ), - None, - _defs_weight_paint.gradient, ], 'PAINT_GPENCIL': [ _defs_view3d_generic.cursor,