[Bf-blender-cvs] [3a2f492db3a] workspaces: Correct error in version patch

Julian Eisel noreply at git.blender.org
Thu May 25 00:44:07 CEST 2017


Commit: 3a2f492db3a7e477e052a0fdbb66544c63ae0756
Author: Julian Eisel
Date:   Mon May 22 00:22:42 2017 +0200
Branches: workspaces
https://developer.blender.org/rB3a2f492db3a7e477e052a0fdbb66544c63ae0756

Correct error in version patch

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

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 5d85df0226a..2c0b144d5b3 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -121,10 +121,14 @@ static void do_version_workspaces_after_lib_link(Main *bmain)
 
 			win->scene = screen->scene;
 			/* Deprecated from now on! */
-			win->screen->scene = screen->scene = NULL;
 			win->screen = NULL;
 		}
 	}
+
+	for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+		/* Deprecated from now on! */
+		screen->scene = NULL;
+	}
 }
 
 void do_versions_after_linking_280(Main *main)




More information about the Bf-blender-cvs mailing list