[Bf-blender-cvs] [2382f979e20] blender2.8: Doversion: Set Clay when opening "Blender Render" engine scenes

[Dalai Felinto]

Commit: 2382f979e206189b9efe14968771ef7f3bfba9dd
Author: Dalai Felinto
Date:   Wed Jul 19 18:14:48 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2382f979e206189b9efe14968771ef7f3bfba9dd

Doversion: Set Clay when opening "Blender Render" engine scenes

We get already enough reports of people complaining about crashes on
edit mode unaware that they are in the non-supported Blender Render
engine.

Blender Render is going away, no reason to keep it around. Once we have
a nice fallback on Eevee and fast file loading we can default to Eevee
instead.

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

M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/versioning_280.c

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

diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 0a678cfe6f8..61d1aa18b3c 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -81,6 +81,10 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+if(WITH_CLAY_ENGINE)
+	add_definitions(-DWITH_CLAY_ENGINE)
+endif()
+
 if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 endif()
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d76a121376c..1c7ecc9ce3b 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -345,7 +345,18 @@ static void do_version_layer_collections_idproperties(ListBase *lb)
 
 void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 {
+
 	if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
+		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+			if (STREQ(scene->r.engine, RE_engine_id_BLENDER_RENDER)) {
+#ifdef WITH_CLAY_ENGINE
+				BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_CLAY, sizeof(scene->r.engine));
+#else
+				BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
+#endif
+			}
+		}
+
 		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "render_layers")) {
 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
 				/* Master Collection */