blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-02-12 17:57:46 +11:00
parent 2c3d4f7e65 657396be08
commit bbb2fa14c8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/interface/resources.c
View File

@ -2309,18 +2309,8 @@ void init_userdef_do_versions(void)
rgba_char_args_set(btheme->tipo.handle_sel_auto_clamped, 0xf0, 0xaf, 0x90, 255);
}
#ifdef WITH_CYCLES
/* enable (Cycles) addon by default */
BKE_addon_ensure(&U.addons, "cycles");
#else
{
bAddon *addon = BLI_findstring(&U.addons, "cycles", offsetof(bAddon, module));
if (addon) {
BKE_addon_free(addon);
BLI_remlink(&U.addons, addon);
}
}
#endif
}
if (!USER_VERSION_ATLEAST(260, 5)) {
@ -2981,6 +2971,15 @@ void init_userdef_do_versions(void)
// we default to the first audio device
U.audiodevice = 0;
/* Not versioning, just avoid errors. */
#ifndef WITH_CYCLES
bAddon *addon = BLI_findstring(&U.addons, "cycles", offsetof(bAddon, module));
if (addon) {
BLI_remlink(&U.addons, addon);
BKE_addon_free(addon);
}
#endif
/* funny name, but it is GE stuff, moves userdef stuff to engine */
// XXX space_set_commmandline_options();
/* this timer uses U */