diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-01-16 03:39:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-16 03:39:12 +0300 |
| commit | 66161ba3a19d7c8757299bd94d6d87a130b48063 (patch) | |
| tree | d7a820ed6a99d17b0e50f159c521f386962240fc /source/blender | |
| parent | a8436334bd9c9c4966e521ccf47368a9d5c2eb51 (diff) | |
| parent | 27c142aa293c4b79dd9ae51915afa1d3c1541e3f (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 51699dae641..f620602f051 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -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; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 3a4e395c914..3d123f07c2b 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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( |