Merge branch 'master' into blender2.8

1 files changed, 9 insertions, 10 deletions

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 5073fb8c0ae..687b225b838 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -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 */