Merge branch 'master' into geometry-nodes

5 files changed, 15 insertions, 5 deletions

diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 8f5a0e027f131104974763d30db36b1a9ffae16
+Subproject 848613f1edf09495bb764144461730662ac0b06
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 33eae7da675d532bbb9c12b129c0e30228f5f00
+Subproject 35c23b4db494e58538a677c4fb0ec9ec1e8ffaa
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 9e86ea19432..ca5e6404159 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2570,9 +2570,12 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
         ],
         'OBJECT': [
             *_tools_default,
-
-            None,
-            _tools_view3d_add,
+            # 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 ()
+            ),
         ],
         'POSE': [
             *_tools_default,
@@ -2600,8 +2603,13 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
         ],
         'EDIT_MESH': [
             *_tools_default,
-            None,
-            _tools_view3d_add,
+
+            # 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,
             (
                 _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 56a9491a5e7..8d73b0a0b93 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2188,6 +2188,7 @@ 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"}, "T00000"),
+                ({"property": "use_object_add_tool"}, "T57210"),
             ),
         )
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 94acab20e66..1b5a7da61b0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -6127,6 +6127,7 @@ class VIEW3D_PT_overlay_geometry(Panel):
         sub = row.row()
         sub.active = overlay.show_wireframes or is_wireframes
         sub.prop(overlay, "wireframe_threshold", text="Wireframe")
+        sub.prop(overlay, "wireframe_opacity", text="Opacity")
 
         row = col.row(align=True)
         if context.mode not in {