Commit: 657396be08b75b6d433e0789910b787f34f28c72
Author: Campbell Barton
Date: Mon Feb 12 17:56:14 2018 +1100
Branches: master
https://developer.blender.org/rB657396be08b75b6d433e0789910b787f34f28c72
Error in last commit, disable cycles when not enabled
Would only disable when loading old preferences.
===================================================================
M source/blender/editors/interface/resources.c
===================================================================
diff --git a/source/blender/editors/interface/resources.c
b/source/blender/editors/interface/resources.c
index 54834fc75ed..ac4892de042 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2148,18 +2148,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)) {
@@ -2804,6 +2794,15 @@ void init_userdef_do_versions(void)
U.audiodevice = 0;
#endif
+ /* 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 */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
