diff options
author | Dalai Felinto <dalai@blender.org> | 2020-10-02 13:01:23 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-10-02 15:05:13 +0300 |
commit | cb363953f0b2c33f72d956485aa12f32ba099ca1 (patch) | |
tree | 5b0fc5ea06c3be5234485af13b5d48d95a1dcac3 | |
parent | 92a0ec87a241fb279f8362e5f2d7cc2c4e57c6d1 (diff) |
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.
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 7 |
2 files changed, 7 insertions, 2 deletions
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; |