Fix T68126: Cycles not enabled with factory settings

2019-08-02 13:04:10 +02:00
parent 0c7a4c74d3
commit b5807be437
2 changed files with 1 additions and 3 deletions
--- 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();
--- 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)) {