blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Pablo Dobarro 2020-10-22 17:02:59 +02:00
parent f73dad211b 73ba3e2a9e
commit cd7354f9f5
4 changed files with 12 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1205,9 +1205,6 @@ class _defs_sculpt:
if not prefs.experimental.use_sculpt_vertex_colors:
exclude_filter = {'PAINT', 'SMEAR'}
if not prefs.experimental.use_tools_missing_icons:
exclude_filter = {'PAINT', 'SMEAR', 'BOUNDARY', 'DISPLACEMENT_ERASER'}
return generate_from_enum_ex(
context,
idname_prefix="builtin_brush.",
@ -2684,50 +2681,18 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
(
_defs_sculpt.mask_border,
_defs_sculpt.mask_lasso,
_defs_sculpt.mask_line,
),
_defs_sculpt.hide_border,
lambda context: (
(_defs_sculpt.mask_line,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
(
_defs_sculpt.face_set_box,
_defs_sculpt.face_set_lasso,
),
lambda context: (
(_defs_sculpt.face_set_box,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
),
lambda context: (
(_defs_sculpt.face_set_lasso,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
),
lambda context: (
(_defs_sculpt.trim_box,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
),
lambda context: (
(_defs_sculpt.trim_lasso,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
),
lambda context: (
(_defs_sculpt.project_line,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
(
_defs_sculpt.trim_box,
_defs_sculpt.trim_lasso,
),
_defs_sculpt.project_line,
None,
_defs_sculpt.mesh_filter,
_defs_sculpt.cloth_filter,
@ -2735,8 +2700,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
(_defs_sculpt.color_filter,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_sculpt_vertex_colors and
context.preferences.experimental.use_tools_missing_icons)
context.preferences.experimental.use_sculpt_vertex_colors)
else ()
),
None,
@ -2744,18 +2708,11 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
(_defs_sculpt.mask_by_color,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_sculpt_vertex_colors and
context.preferences.experimental.use_tools_missing_icons)
context.preferences.experimental.use_sculpt_vertex_colors)
else ()
),
None,
lambda context: (
(_defs_sculpt.face_set_edit,)
if context is None or (
context.preferences.view.show_developer_ui and
context.preferences.experimental.use_tools_missing_icons)
else ()
),
_defs_sculpt.face_set_edit,
None,
_defs_transform.translate,
_defs_transform.rotate,

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

@ -2185,7 +2185,6 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel):
self._draw_items(
context, (
({"property": "use_sculpt_vertex_colors"}, "T71947"),
({"property": "use_tools_missing_icons"}, "T80331"),
({"property": "use_switch_object_operator"}, "T80402"),
({"property": "use_sculpt_tools_tilt"}, "T00000"),
),

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

@ -633,10 +633,9 @@ typedef struct UserDef_Experimental {
char use_new_hair_type;
char use_new_point_cloud_type;
char use_sculpt_vertex_colors;
char use_tools_missing_icons;
char use_switch_object_operator;
char use_sculpt_tools_tilt;
char _pad[6];
char _pad[7];
/** `makesdna` does not allow empty structs. */
} UserDef_Experimental;

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

@ -6175,10 +6175,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
RNA_def_property_ui_text(
prop, "Switch Object Operator", "Enable the operator to switch objects by pressing D");
prop = RNA_def_property(srna, "use_tools_missing_icons", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_tools_missing_icons", 1);
RNA_def_property_ui_text(prop, "Tools with Missing Icons", "Show tools with missing icons");
prop = RNA_def_property(srna, "use_sculpt_tools_tilt", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "use_sculpt_tools_tilt", 1);
RNA_def_property_ui_text(