Commit: bbb2fa14c821d14cf977a9ebba2018a42b806bec
Author: Campbell Barton
Date:   Mon Feb 12 17:57:46 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBbbb2fa14c821d14cf977a9ebba2018a42b806bec

Merge branch 'master' into blender2.8

===================================================================



===================================================================

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

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to