archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: make add object tool experimental

Browse Source 
Some changes here are planned which need feedback from users before
declaring this ready for the next release.
This commit is contained in:
Campbell Barton
2020-11-13 17:27:39 +11:00
parent ccf8df66fe
commit f00ebd4dba
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@@ -2570,9 +2570,12 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
], ],
'OBJECT': [ 'OBJECT': [
*_tools_default, *_tools_default,
# Currently experimental.
None, # None, _tools_view3d_add,
_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': [ 'POSE': [
*_tools_default, *_tools_default,
@@ -2600,8 +2603,13 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
], ],
'EDIT_MESH': [ 'EDIT_MESH': [
*_tools_default, *_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, None,
( (
_defs_edit_mesh.extrude, _defs_edit_mesh.extrude,

1
release/scripts/startup/bl_ui/space_userpref.py
View File

@@ -2188,6 +2188,7 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
({"property": "use_sculpt_vertex_colors"}, "T71947"), ({"property": "use_sculpt_vertex_colors"}, "T71947"),
({"property": "use_switch_object_operator"}, "T80402"), ({"property": "use_switch_object_operator"}, "T80402"),
({"property": "use_sculpt_tools_tilt"}, "T00000"), ({"property": "use_sculpt_tools_tilt"}, "T00000"),
({"property": "use_object_add_tool"}, "T57210"),
), ),
) )

3
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -636,7 +636,8 @@ typedef struct UserDef_Experimental {
char use_sculpt_vertex_colors; char use_sculpt_vertex_colors;
char use_switch_object_operator; char use_switch_object_operator;
char use_sculpt_tools_tilt; char use_sculpt_tools_tilt;
char _pad[7]; char use_object_add_tool;
char _pad[6];
/** `makesdna` does not allow empty structs. */ /** `makesdna` does not allow empty structs. */
} UserDef_Experimental; } UserDef_Experimental;

5
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -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_boolean_sdna(prop, NULL, "use_sculpt_tools_tilt", 1);
RNA_def_property_ui_text( RNA_def_property_ui_text(
prop, "Sculpt Mode Tilt Support", "Support for pen tablet tilt events in Sculpt Mode"); 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) static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop)