Disable cycles when WITH_CYCLES=OFF

diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index ede28b49dbee2a5e98caea70a287640b960f0cfe..0adc315fd692ce8fac972ac38020646d7beea65e 100644 (file)
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -82,6 +82,10 @@ if(WITH_HEADLESS)
        add_definitions(-DWITH_HEADLESS)
 endif()
 
+if(WITH_CYCLES)
+       add_definitions(-DWITH_CYCLES)
+endif()
+
 if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index fd73ff8552a532e22948641d78c810be03b60813..54834fc75edc27d928b794baaeea75f89ccc1471 100644 (file)
--- 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)) {