diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-01-16 03:39:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-16 03:39:12 +0300 |
| commit | 66161ba3a19d7c8757299bd94d6d87a130b48063 (patch) | |
| tree | d7a820ed6a99d17b0e50f159c521f386962240fc /release/scripts/startup/bl_ui | |
| parent | a8436334bd9c9c4966e521ccf47368a9d5c2eb51 (diff) | |
| parent | 27c142aa293c4b79dd9ae51915afa1d3c1541e3f (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'release/scripts/startup/bl_ui')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 16 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 |
2 files changed, 4 insertions, 13 deletions
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")), ), ) |