From e255040c7797a282cb0ea614e3f95c6a59cd0298 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Oct 2020 23:23:57 +1000 Subject: 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. --- source/blender/editors/interface/resources.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'source/blender/editors/interface/resources.c') 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 -} -- cgit v1.2.3