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 /source/blender | |
parent | f73dad211b1dcb94aa83d7447a1a7d1d3ea641c1 (diff) | |
parent | 73ba3e2a9ea15a77994fb27a855e0a6e5f232950 (diff) |
Merge branch 'blender-v2.91-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 | 4 |
2 files changed, 1 insertions, 6 deletions
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( |