diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 00:56:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 01:00:05 +0300 |
| commit | e103618b281f4783b43b080d46e78f52fa2198db (patch) | |
| tree | c723e1a6d5456826a4c650abea3dce321d7ad3a5 /source/blender/blenloader | |
| parent | 07ab3eec01f812bffccb4e60f532b53ff198f4c8 (diff) | |
Cleanup: move cycles addon check out of versioning
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 16 |
2 files changed, 6 insertions, 15 deletions
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index cf8685ef824..e0453e71a05 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -94,11 +94,6 @@ if(WITH_ALEMBIC) add_definitions(-DWITH_ALEMBIC) endif() -# Needed for versioning userdef. -if(WITH_CYCLES) - add_definitions(-DWITH_CYCLES) -endif() - blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}") # needed so writefile.c can use dna_type_offsets.h diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index a55568129c5..00a07ae7b80 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -42,21 +42,22 @@ /* Disallow access to global userdef. */ #define U (_error_) -#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver) static void do_versions_theme(UserDef *userdef, bTheme *btheme) { + +#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver) if (!USER_VERSION_ATLEAST(280, 20)) { memcpy(btheme, &U_theme_default, sizeof(*btheme)); } -} - #undef USER_VERSION_ATLEAST +} /* patching UserDef struct and Themes */ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) { + #define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(bmain, ver, subver) /* the UserDef struct is not corrected with do_versions() .... ugh! */ @@ -330,14 +331,9 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) // we default to the first audio device userdef->audiodevice = 0; - /* Not versioning, just avoid errors. */ -#ifndef WITH_CYCLES - BKE_addon_remove_safe(&userdef->addons, "cycles"); -#endif - /* this timer uses U */ -// XXX reset_autosave(); - for (bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) { do_versions_theme(userdef, btheme); } +#undef USER_VERSION_ATLEAST + } |