blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Campbell Barton 2021-01-16 11:39:12 +11:00
parent a8436334bd 27c142aa29
commit 66161ba3a1
4 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

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

@ -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")),
),
)

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

@ -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;

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

@ -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(