[Bf-blender-cvs] [b5807be4378] master: Fix T68126: Cycles not enabled with factory settings

[Brecht Van Lommel]

Commit: b5807be43780c575ef278e917abf2e71c4b7b169
Author: Brecht Van Lommel
Date:   Fri Aug 2 13:04:10 2019 +0200
Branches: master
https://developer.blender.org/rBb5807be43780c575ef278e917abf2e71c4b7b169

Fix T68126: Cycles not enabled with factory settings

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

M	source/blender/blenkernel/intern/blendfile.c
M	source/blender/blenloader/intern/versioning_userdef.c

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

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index bc62ad685ef..4ceae89dfbb 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -574,6 +574,7 @@ UserDef *BKE_blendfile_userdef_from_defaults(void)
         "io_scene_gltf2",
         "io_scene_obj",
         "io_scene_x3d",
+        "cycles",
     };
     for (int i = 0; i < ARRAY_SIZE(addons); i++) {
       bAddon *addon = BKE_addon_new();
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 709e6dc17b6..e42a9bc9f95 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -370,9 +370,6 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
     if (userdef->keyhandles_new == HD_AUTO) {
       userdef->keyhandles_new = HD_AUTO_ANIM;
     }
-
-    /* enable (Cycles) addon by default */
-    BKE_addon_ensure(&userdef->addons, "cycles");
   }
 
   if (!USER_VERSION_ATLEAST(267, 0)) {