Commit: cb363953f0b2c33f72d956485aa12f32ba099ca1
Author: Dalai Felinto
Date: Fri Oct 2 12:01:23 2020 +0200
Branches: master
https://developer.blender.org/rBcb363953f0b2c33f72d956485aa12f32ba099ca1
Experimental Features: Sanitize missing (latest) options
There was an oversight when adding new experimental user preferences.
I can try to overengineer this later to make it more fail-proof. But for now
it should be clear what to update when adding a new variable.
===================================================================
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/makesdna/DNA_userdef_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_userdef.c
b/source/blender/blenloader/intern/versioning_userdef.c
index 0265bd85f14..a9082d207ca 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -827,6 +827,8 @@ void
BLO_sanitize_experimental_features_userpref_blend(UserDef *userdef)
userdef->experimental.use_new_particle_system = false;
userdef->experimental.use_new_hair_type = false;
userdef->experimental.use_sculpt_vertex_colors = false;
+ userdef->experimental.use_tools_missing_icons = false;
+ userdef->experimental.use_switch_object_operator = false;
}
#undef USER_LMOUSESELECT
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index 1ed2fba208f..47b8e5b83bd 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -622,12 +622,15 @@ typedef struct UserDef_FileSpaceData {
} UserDef_FileSpaceData;
typedef struct UserDef_Experimental {
+ /* Debug options, always available. */
char use_undo_legacy;
+ char use_cycles_debug;
+ char use_image_editor_legacy_drawing;
+ /* Other options - remember to turn them off on
+ * BLO_sanitize_experimental_features_userpref_blend. */
char use_new_particle_system;
char use_new_hair_type;
- char use_cycles_debug;
char use_sculpt_vertex_colors;
- char use_image_editor_legacy_drawing;
char use_tools_missing_icons;
char use_switch_object_operator;
} UserDef_Experimental;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
