Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-02 14:04:10 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-02 14:04:10 +0300
commitb5807be43780c575ef278e917abf2e71c4b7b169 (patch)
treec85e1c97f80aff28eb4ff560996371bc8ff42fa5 /source
parent0c7a4c74d3452eba123749366abe23900890a53b (diff)
Fix T68126: Cycles not enabled with factory settings
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c1
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c3
2 files changed, 1 insertions, 3 deletions
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)) {