[Bf-blender-cvs] [dc16f6fedc0] blender2.8: Fix T54767: Crash in versionning code for recent editors' removal.

[Bastien Montagne]

Commit: dc16f6fedc0c551032e1b732850cfb6ab2b5c785
Author: Bastien Montagne
Date:   Mon Apr 23 12:27:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdc16f6fedc0c551032e1b732850cfb6ab2b5c785

Fix T54767: Crash in versionning code for recent editors' removal.

Always check for non-Null pointers there! This versionning code is
called from many different places, with many different kind of Main's.

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

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

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 09e53bc9eb7..bfcd6ca27f9 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -654,9 +654,9 @@ void do_versions_after_linking_280(Main *main)
 	/* SpaceTime & SpaceLogic removal/replacing */
 	if (!MAIN_VERSION_ATLEAST(main, 280, 9)) {
 		const wmWindowManager *wm = main->wm.first;
-		if (wm != NULL) {
-			const Scene *scene = main->scene.first;
+		const Scene *scene = main->scene.first;
 
+		if (wm != NULL) {
 			/* Action editors need a scene for creation. First, update active
 			 * screens using the active scene of the window they're displayed in.
 			 * Next, update remaining screens using first scene in main listbase. */
@@ -672,7 +672,8 @@ void do_versions_after_linking_280(Main *main)
 					}
 				}
 			}
-
+		}
+		if (scene != NULL) {
 			for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 				for (ScrArea *area = screen->areabase.first; area; area = area->next) {
 					if (ELEM(area->butspacetype, SPACE_TIME, SPACE_LOGIC)) {
diff --git a/source/tools b/source/tools
index f35d8e55aff..56f3887596b 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit f35d8e55afffb9da50cc13b14615ed280f9e558c
+Subproject commit 56f3887596b538a9fc17e0439883f2e2305f2633