[Bf-blender-cvs] [27c142aa293] blender-v2.92-release: Add Object Tool: remove from experimental

[Campbell Barton]

Commit: 27c142aa293c4b79dd9ae51915afa1d3c1541e3f
Author: Campbell Barton
Date:   Sat Jan 16 11:23:44 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rB27c142aa293c4b79dd9ae51915afa1d3c1541e3f

Add Object Tool: remove from experimental

Based on feedback from @dbystedt, include this in 2.92
with some updates (coming next).

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/makesdna/DNA_userdef_types.h
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index aa90e364ef9..d0122536e94 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2581,12 +2581,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
         ],
         'OBJECT': [
             *_tools_default,
-            # Currently experimental.
-            # None, _tools_view3d_add,
-            lambda context: (
-                (None, VIEW3D_PT_tools_active._tools_view3d_add)
-                if (context is None or context.preferences.experimental.use_object_add_tool) else ()
-            ),
+            None,
+            _tools_view3d_add,
         ],
         'POSE': [
             *_tools_default,
@@ -2615,12 +2611,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
         'EDIT_MESH': [
             *_tools_default,
 
-            # Currently experimental.
-            # None, _tools_view3d_add,
-            lambda context: (
-                (None, VIEW3D_PT_tools_active._tools_view3d_add)
-                if (context is None or context.preferences.experimental.use_object_add_tool) else ()
-            ),
+            None,
+            _tools_view3d_add,
             None,
             (
                 _defs_edit_mesh.extrude,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 22c0ce7f56b..4b30266a5fe 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2236,7 +2236,6 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
                 ({"property": "use_sculpt_vertex_colors"}, "T71947"),
                 ({"property": "use_switch_object_operator"}, "T80402"),
                 ({"property": "use_sculpt_tools_tilt"}, "T82877"),
-                ({"property": "use_object_add_tool"}, "T57210"),
                 ({"property": "use_asset_browser"}, ("project/profile/124/", "Milestone 1")),
             ),
         )
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 51699dae641..f620602f051 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -643,9 +643,8 @@ typedef struct UserDef_Experimental {
   char use_sculpt_vertex_colors;
   char use_switch_object_operator;
   char use_sculpt_tools_tilt;
-  char use_object_add_tool;
   char use_asset_browser;
-  char _pad[6];
+  char _pad[7];
   /** `makesdna` does not allow empty structs. */
 } UserDef_Experimental;
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 3a4e395c914..3d123f07c2b 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6225,11 +6225,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
   RNA_def_property_ui_text(
       prop, "Sculpt Mode Tilt Support", "Support for pen tablet tilt events in Sculpt Mode");
 
-  prop = RNA_def_property(srna, "use_object_add_tool", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "use_object_add_tool", 1);
-  RNA_def_property_ui_text(
-      prop, "Add Object Tool", "Show add object tool in the toolbar in Object Mode and Edit Mode");
-
   prop = RNA_def_property(srna, "use_asset_browser", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "use_asset_browser", 1);
   RNA_def_property_ui_text(