Fix crash reading 2.8 files with workspace.view_layer set

Stupid error from e8c15e0ed15f8369d.

Also removed WorkSpace.view_layer usage and marked as deprecated.

2 files changed, 24 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a91c83c68ef..e6d2be02977 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6188,6 +6188,14 @@ static void direct_link_workspace_link_scene_data(
 				relation->value = layer;
 			}
 		}
+
+		if (workspace->view_layer) { /* this was temporariliy used during 2.8 project. Keep files compatible */
+			ViewLayer *layer = newdataadr(fd, workspace->view_layer);
+			/* only set when layer is from the scene we read */
+			if (layer && (BLI_findindex(&scene->view_layers, layer) != -1)) {
+				workspace->view_layer = layer;
+			}
+		}
 	}
 }
 
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 8f2295781bf..c718702388a 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -549,6 +549,22 @@ void do_versions_after_linking_280(Main *main)
 		}
 	}
 
+	if (!MAIN_VERSION_ATLEAST(main, 280, 3)) {
+		for (WorkSpace *workspace = main->workspaces.first; workspace; workspace = workspace->id.next) {
+			if (workspace->view_layer) {
+				/* During 2.8 work we temporarly stored view-layer in the
+				 * workspace directly, but should be stored there per-scene. */
+				for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+					if (BLI_findindex(&scene->view_layers, workspace->view_layer) > -1) {
+						BKE_workspace_view_layer_set(workspace, workspace->view_layer, scene);
+						workspace->view_layer = NULL;
+					}
+				}
+			}
+			BLI_assert(workspace->view_layer == NULL);
+		}
+	}
+
 	{
 		/* Since we don't have access to FileData we check the (always valid) master collection of the group. */
 		for (Group *group = main->group.first; group; group = group->id.next) {