diff options
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 18 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 5 |
4 files changed, 21 insertions, 6 deletions
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/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index f673b193a39..464eed4779f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -636,7 +636,8 @@ typedef struct UserDef_Experimental { char use_sculpt_vertex_colors; char use_switch_object_operator; char use_sculpt_tools_tilt; - char _pad[7]; + char use_object_add_tool; + char _pad[6]; /** `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 1bfa8547ca4..6ddc2e3ef57 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -6181,6 +6181,11 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "use_sculpt_tools_tilt", 1); 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"); } static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop) |