[Bf-blender-cvs] [c0bc3c2e149] topbar: Move info editor removal versioning code to pre-lib-linking stage

[Julian Eisel]

Commit: c0bc3c2e149a5748ba4d6e84f6c72f99d8fd9d80
Author: Julian Eisel
Date:   Mon Oct 23 03:36:09 2017 +0200
Branches: topbar
https://developer.blender.org/rBc0bc3c2e149a5748ba4d6e84f6c72f99d8fd9d80

Move info editor removal versioning code to pre-lib-linking stage

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

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 e51c790dbcd..65b680a3e17 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -342,26 +342,6 @@ void do_versions_after_linking_280(Main *main)
 				ED_screen_global_topbar_area_create(NULL, win, screen);
 			}
 		}
-
-		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
-			for (ScrArea *area = screen->areabase.first, *area_next; area; area = area_next) {
-				area_next = area->next;
-
-				if (area->spacetype == SPACE_INFO) {
-					BKE_screen_area_free(area);
-
-					BLI_remlink(&screen->areabase, area);
-
-					BKE_screen_remove_double_scredges(screen);
-					BKE_screen_remove_unused_scredges(screen);
-					BKE_screen_remove_unused_scrverts(screen);
-
-					MEM_freeN(area);
-				}
-				/* AREA_TEMP_INFO is deprecated from now on, it should only be set for info areas
-				 * which are deleted above, so don't need to unset it. Its slot/bit can be reused */
-			}
-		}
 	}
 }
 
@@ -583,5 +563,25 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 				}
 			}
 		}
+
+		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+			for (ScrArea *area = screen->areabase.first, *area_next; area; area = area_next) {
+				area_next = area->next;
+
+				if (area->spacetype == SPACE_INFO) {
+					BKE_screen_area_free(area);
+
+					BLI_remlink(&screen->areabase, area);
+
+					BKE_screen_remove_double_scredges(screen);
+					BKE_screen_remove_unused_scredges(screen);
+					BKE_screen_remove_unused_scrverts(screen);
+
+					MEM_freeN(area);
+				}
+				/* AREA_TEMP_INFO is deprecated from now on, it should only be set for info areas
+				 * which are deleted above, so don't need to unset it. Its slot/bit can be reused */
+			}
+		}
 	}
 }