From afcdea3961c2cc9a63c2e8613f8bbfa0ba49f583 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 12 Dec 2019 12:47:45 +0100 Subject: UI: Remove User Preference "Enable All Experimental Features" Users should be able to know explicitly what they are testing. By having them all enabled we run into a scenario where a new experimental feature may have been introduced, and the user is now using it without being even aware of that. Differential Revision: https://developer.blender.org/D6404 --- source/blender/makesdna/DNA_userdef_types.h | 13 ++----------- source/blender/makesrna/intern/rna_userdef.c | 7 ------- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'source/blender') diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 6710538a5c7..c378f52d7ba 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -601,17 +601,13 @@ typedef struct UserDef_FileSpaceData { } UserDef_FileSpaceData; typedef struct UserDef_Experimental { - /** #eUserPref_Experimental_Flag options. */ - int flag; - char use_tool_fallback; - char _pad0[3]; + char _pad0[7]; } UserDef_Experimental; #define USER_EXPERIMENTAL_TEST(userdef, member) \ - (((userdef)->flag & USER_DEVELOPER_UI) && \ - (((userdef)->experimental.flag & USER_EXPERIMENTAL_ALL) || ((userdef)->experimental).member)) + (((userdef)->flag & USER_DEVELOPER_UI) && ((userdef)->experimental).member) typedef struct UserDef { /** UserDef has separate do-version handling, and can be read from other files. */ @@ -908,11 +904,6 @@ typedef enum eUserPref_SpaceData_Flag { USER_SPACEDATA_ADDONS_SHOW_ONLY_ENABLED = (1 << 1), } eUserPref_SpaceData_Flag; -/** #UserDef_Experimental.flag. */ -typedef enum eUserPref_Experimental_Flag { - USER_EXPERIMENTAL_ALL = (1 << 0), -} eUserPref_Experimental_Flag; - /** #UserDef.flag */ typedef enum eUserPref_Flag { USER_AUTOSAVE = (1 << 0), diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 46779c9cf71..1267cfed3d8 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5858,13 +5858,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) RNA_def_struct_clear_flag(srna, STRUCT_UNDO); RNA_def_struct_ui_text(srna, "Experimental", "Experimental features"); - prop = RNA_def_property(srna, "use_experimental_all", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_EXPERIMENTAL_ALL); - RNA_def_property_ui_text(prop, - "All Experimental Features", - "Expose all the experimental features in the user interface"); - RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop = RNA_def_property(srna, "use_tool_fallback", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_tool_fallback", 1); RNA_def_property_boolean_funcs(prop, "rna_userdef_experimental_use_tool_fallback_get", NULL); -- cgit v1.2.3