[Bf-blender-cvs] [9e9ebf6210a] workspaces: Fix crash loading pre-2.80 .blends

[Julian Eisel]

Commit: 9e9ebf6210aab361a4ce67754a7133e5586d1ecb
Author: Julian Eisel
Date:   Fri May 5 21:45:36 2017 +0200
Branches: workspaces
https://developer.blender.org/rB9e9ebf6210aab361a4ce67754a7133e5586d1ecb

Fix crash loading pre-2.80 .blends

Caused by rBe0f4fbd45ad6e57b.

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

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 79b2d8062d7..88d0084ec6c 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -287,11 +287,14 @@ void do_versions_after_linking_280(Main *main)
 
 	if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
 		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+			/* same render-layer as do_version_workspaces_after_lib_link will activate,
+			 * so same layer as BKE_scene_layer_context_active would return */
+			SceneLayer *layer = screen->scene->render_layers.first;
+
 			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_OUTLINER) {
 						SpaceOops *soutliner = (SpaceOops *)sl;
-						SceneLayer *layer = BKE_scene_layer_context_active(screen->scene);
 
 						soutliner->outlinevis = SO_ACT_LAYER;