Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:57:46 +0000 (17:57 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Feb 2018 06:57:53 +0000 (17:57 +1100)
1  2 
source/blender/editors/interface/resources.c

index 5073fb8c0aeca9b1f539a124ba26c147f6c724ee,ac4892de042773b1613882d1b39091a730858251..687b225b83824899c5d192e8b6b7f7495cfa302d
@@@ -2978,9 -2788,21 +2968,18 @@@ void init_userdef_do_versions(void
        if (U.image_draw_method == 0)
                U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE;
        
 -      // keep the following until the new audaspace is default to be built with
 -#ifdef WITH_SYSTEM_AUDASPACE
        // we default to the first audio device
        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 */