[Bf-blender-cvs] [03b8e4f6087] blender2.8: Fix importing temporary screens

Sybren A. Stüvel noreply at git.blender.org
Wed Jun 6 11:13:54 CEST 2018


Commit: 03b8e4f6087ad5301557fda1b66e2e370731dae4
Author: Sybren A. Stüvel
Date:   Wed Jun 6 11:13:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB03b8e4f6087ad5301557fda1b66e2e370731dae4

Fix importing temporary screens

Apparently Blender 2.79 could save temporary screens; those should not be
converted to workspaces.

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index b4f0b2ddfd2..57d36dede70 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -97,6 +97,9 @@ static void do_version_workspaces_create_from_screens(Main *bmain)
 		Scene *scene = screen->scene;
 		WorkSpace *workspace;
 		ViewLayer *layer = BLI_findlink(&scene->view_layers, scene->r.actlay);
+		if (screen->temp) {
+			continue;
+		}
 		if (!layer) {
 			layer = BKE_view_layer_default_view(scene);
 		}



More information about the Bf-blender-cvs mailing list