diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_toolsystem_toolbar.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 65 |
1 files changed, 11 insertions, 54 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 9eee69b9a04..ebe00668474 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1205,9 +1205,6 @@ class _defs_sculpt: if not prefs.experimental.use_sculpt_vertex_colors: exclude_filter = {'PAINT', 'SMEAR'} - if not prefs.experimental.use_tools_missing_icons: - exclude_filter = {'PAINT', 'SMEAR', 'BOUNDARY', 'DISPLACEMENT_ERASER'} - return generate_from_enum_ex( context, idname_prefix="builtin_brush.", @@ -2684,50 +2681,18 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ( _defs_sculpt.mask_border, _defs_sculpt.mask_lasso, + _defs_sculpt.mask_line, ), _defs_sculpt.hide_border, - lambda context: ( - (_defs_sculpt.mask_line,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () - ), - lambda context: ( - (_defs_sculpt.face_set_box,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () - ), - lambda context: ( - (_defs_sculpt.face_set_lasso,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () - ), - lambda context: ( - (_defs_sculpt.trim_box,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () - ), - lambda context: ( - (_defs_sculpt.trim_lasso,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () + ( + _defs_sculpt.face_set_box, + _defs_sculpt.face_set_lasso, ), - lambda context: ( - (_defs_sculpt.project_line,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () + ( + _defs_sculpt.trim_box, + _defs_sculpt.trim_lasso, ), + _defs_sculpt.project_line, None, _defs_sculpt.mesh_filter, _defs_sculpt.cloth_filter, @@ -2735,8 +2700,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): (_defs_sculpt.color_filter,) if context is None or ( context.preferences.view.show_developer_ui and - context.preferences.experimental.use_sculpt_vertex_colors and - context.preferences.experimental.use_tools_missing_icons) + context.preferences.experimental.use_sculpt_vertex_colors) else () ), None, @@ -2744,18 +2708,11 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): (_defs_sculpt.mask_by_color,) if context is None or ( context.preferences.view.show_developer_ui and - context.preferences.experimental.use_sculpt_vertex_colors and - context.preferences.experimental.use_tools_missing_icons) + context.preferences.experimental.use_sculpt_vertex_colors) else () ), None, - lambda context: ( - (_defs_sculpt.face_set_edit,) - if context is None or ( - context.preferences.view.show_developer_ui and - context.preferences.experimental.use_tools_missing_icons) - else () - ), + _defs_sculpt.face_set_edit, None, _defs_transform.translate, _defs_transform.rotate, |