diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 16:23:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-03 00:25:36 +0300 |
commit | e255040c7797a282cb0ea614e3f95c6a59cd0298 (patch) | |
tree | 74288668c0795403f7a44ff6e53588ef7568d611 /source/blender/editors/interface | |
parent | 15a9579a03f1ca65df477a1a39dbaef572ff3e9f (diff) |
Cleanup: run UserDef versioning from readfile.c
Now versioning UserDef is run in readfile.c,
as is done for other Blender data.
Previously versioning was mixed with other run-time initialization,
so it needed to be called later by the window manager.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 5 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 15 |
3 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index d93d80bb4ef..85097a80b53 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -7061,11 +7061,8 @@ void UI_init(void) /* after reading userdef file */ void UI_init_userdef(void) { - /* fix saved themes */ - init_userdef_do_versions(); + /* Initialize UI variables from values set in the preferences. */ uiStyleInit(); - - BLO_sanitize_experimental_features_userpref_blend(&U); } void UI_reinit_font(void) diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 7ac6ca4577e..194726b1347 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -993,7 +993,6 @@ void icon_draw_rect_input( float x, float y, int w, int h, float alpha, short event_type, short event_value); /* resources.c */ -void init_userdef_do_versions(void); void ui_resources_init(void); void ui_resources_free(void); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 1601d9914a3..ec6f99f167d 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1499,18 +1499,3 @@ void UI_make_axis_color(const uchar src_col[3], uchar dst_col[3], const char axi break; } } - -/* patching UserDef struct and Themes */ -void init_userdef_do_versions(void) -{ - BLO_version_defaults_userpref_blend(&U); - - if (STREQ(U.tempdir, "/")) { - BKE_tempdir_system_init(U.tempdir); - } - - /* Not versioning, just avoid errors. */ -#ifndef WITH_CYCLES - BKE_addon_remove_safe(&U.addons, "cycles"); -#endif -} |