diff options
author | Pablo Dobarro <pablodp606@gmail.com> | 2020-10-22 18:02:59 +0300 |
---|---|---|
committer | Pablo Dobarro <pablodp606@gmail.com> | 2020-10-22 18:02:59 +0300 |
commit | cd7354f9f597d8de7e37bb34e82d896e6bf270e5 (patch) | |
tree | 38022416a15a2bd25152f589bae0531430067660 | |
parent | f73dad211b1dcb94aa83d7447a1a7d1d3ea641c1 (diff) | |
parent | 73ba3e2a9ea15a77994fb27a855e0a6e5f232950 (diff) |
Merge branch 'blender-v2.91-release'
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 65 | ||||
-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 | 4 |
4 files changed, 12 insertions, 61 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 9eee69b9a04..ebe00668474 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -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 () - ), - 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 () + ( + _defs_sculpt.face_set_box, + _defs_sculpt.face_set_lasso, ), - 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, diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 20aa04fb725..b4b8a631b93 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -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"), ), diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index ad032a6d7b6..4a02ac8f429 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -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; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 061026288e6..c31766efe58 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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( |