diff options
author | William Reynish <billrey@me.com> | 2019-06-07 11:35:07 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-06-07 11:35:07 +0300 |
commit | b290695149c9be1de360c67fdb154c99390f81c5 (patch) | |
tree | 1f180761f83f4515aad81f03e7a9c0bbd07a9a9a | |
parent | 4de7a7f2fabf24c43517f43f43bca630948dd13e (diff) |
Sculpt toolbar: Group new Mask Lasso tool with the Mask Border tool
Also flip Simplify and Mask, so that all the mask-related tools are next to each other.
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 56e6536f3a2..a2b96c9d6c7 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1907,9 +1907,11 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): 'SCULPT': [ _defs_sculpt.generate_from_brushes, None, + ( + _defs_sculpt.mask_border, + _defs_sculpt.mask_lasso, + ), _defs_sculpt.hide_border, - _defs_sculpt.mask_border, - _defs_sculpt.mask_lasso, None, *_tools_annotate, ], diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index a049b7573c4..d20b99e93e1 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -89,8 +89,8 @@ const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = { {SCULPT_TOOL_NUDGE, "NUDGE", ICON_BRUSH_NUDGE, "Nudge", ""}, {SCULPT_TOOL_ROTATE, "ROTATE", ICON_BRUSH_ROTATE, "Rotate", ""}, {0, "", 0, NULL, NULL}, + {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_DATA, "Simplify", ""}, {SCULPT_TOOL_MASK, "MASK", ICON_BRUSH_MASK, "Mask", ""}, - {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_DATA /* icon TODO */, "Simplify", ""}, {0, NULL, 0, NULL, NULL}, }; |