From 73ba3e2a9ea15a77994fb27a855e0a6e5f232950 Mon Sep 17 00:00:00 2001
From: Pablo Dobarro <pablodp606@gmail.com>
Date: Wed, 21 Oct 2020 16:44:28 +0200
Subject: Sculpt: Remove tools with missing icons experimental option

All tools planned for 2.91 now have icons, so this option can be
removed.

Reviewed By: dfelinto, Severin

Differential Revision: https://developer.blender.org/D9299
---
 .../startup/bl_ui/space_toolsystem_toolbar.py      | 65 ++++------------------
 release/scripts/startup/bl_ui/space_userpref.py    |  1 -
 2 files changed, 11 insertions(+), 55 deletions(-)

(limited to 'release/scripts')

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,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 20aa04fb725..b4b8a631b93 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2185,7 +2185,6 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
         self._draw_items(
             context, (
                 ({"property": "use_sculpt_vertex_colors"}, "T71947"),
-                ({"property": "use_tools_missing_icons"}, "T80331"),
                 ({"property": "use_switch_object_operator"}, "T80402"),
                 ({"property": "use_sculpt_tools_tilt"}, "T00000"),
             ),
-- 
cgit v1.2.3