From 53431a560e51d106e78de00f7faef5bfccc8e933 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Feb 2018 17:37:39 +1100 Subject: Disable cycles when WITH_CYCLES=OFF --- source/blender/editors/interface/resources.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (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 fd73ff8552a..54834fc75ed 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2147,9 +2147,19 @@ void init_userdef_do_versions(void) if (btheme->tipo.handle_sel_auto_clamped[3] == 0) 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)) { -- cgit v1.2.3