diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-17 14:35:05 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-18 17:35:38 +0300 |
commit | f9cf2e2f6cc779764f46dae7ceadc4bb2e9ddcb5 (patch) | |
tree | 0f409fce181813cab818bfb83a33779e38774684 /source/blender/blenloader/intern/versioning_280.c | |
parent | 15850a8740ed95afdc5779e224bf40f7540a7d62 (diff) |
Workspaces: remove workspace engine, use 3D viewport draw mode instead.
ViewRender was removed, which means we can't get the render engine for files
saved in 2.8. We assume that any files saved in 2.8 were intended to use Eevee
and set the engine to that.
A fix included with this is that .blend thumbails now draw with Clay mode,
and never Eevee or Cycles. These were drawn with solid mode in 2.7, and should
be very fast and not e.g. load heavy image textures.
Differential Revision: https://developer.blender.org/D3156
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 490344d30fa..b2bb2fd792b 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -107,14 +107,6 @@ static void do_version_workspaces_create_from_screens(Main *bmain) } BKE_workspace_layout_add(workspace, screen, screen->id.name + 2); BKE_workspace_view_layer_set(workspace, layer, scene); - -#ifdef WITH_CLAY_ENGINE - BLI_strncpy(workspace->view_render.engine_id, RE_engine_id_BLENDER_CLAY, - sizeof(workspace->view_render.engine_id)); -#else - BLI_strncpy(workspace->view_render.engine_id, RE_engine_id_BLENDER_EEVEE, - sizeof(workspace->view_render.engine_id)); -#endif } } @@ -828,17 +820,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) printf("You need to combine transparency and emission shaders to the converted Principled shader nodes.\n"); } - if (!DNA_struct_elem_find(fd->filesdna, "Scene", "ViewRender", "view_render")) { - for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - BLI_strncpy_utf8(scene->view_render.engine_id, scene->r.engine, - sizeof(scene->view_render.engine_id)); - } - - for (WorkSpace *workspace = main->workspaces.first; workspace; workspace = workspace->id.next) { - BKE_viewrender_init(&workspace->view_render); - } - } - if ((DNA_struct_elem_find(fd->filesdna, "ViewLayer", "FreestyleConfig", "freestyle_config") == false) && DNA_struct_elem_find(fd->filesdna, "Scene", "ListBase", "view_layers")) { @@ -945,4 +926,15 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) } } } + + if (!MAIN_VERSION_ATLEAST(main, 280, 7)) { + /* Render engine storage moved elsewhere and back during 2.8 + * development, we assume any files saved in 2.8 had Eevee set + * as scene render engine. */ + if (MAIN_VERSION_ATLEAST(main, 280, 0)) { + for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { + BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine)); + } + } + } } |