Error in last commit, disable cycles when not enabled
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:56:14 +0000 (17:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:56:14 +0000 (17:56 +1100)
Would only disable when loading old preferences.

source/blender/editors/interface/resources.c

index 54834fc75edc27d928b794baaeea75f89ccc1471..ac4892de042773b1613882d1b39091a730858251 100644 (file)
@@ -2148,18 +2148,8 @@ void init_userdef_do_versions(void)
                                rgba_char_args_set(btheme->tipo.handle_sel_auto_clamped, 0xf0, 0xaf, 0x90, 255);
                }
 
                                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");
                /* 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)) {
        }
        
        if (!USER_VERSION_ATLEAST(260, 5)) {
@@ -2804,6 +2794,15 @@ void init_userdef_do_versions(void)
        U.audiodevice = 0;
 #endif
 
        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 */
        /* funny name, but it is GE stuff, moves userdef stuff to engine */
 // XXX space_set_commmandline_options();
        /* this timer uses U */