1 files changed, 57 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 493bf17a552..18eff782d99 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -65,6 +65,7 @@
 #include "BKE_node.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_screen.h"
 #include "BKE_workspace.h"
 
 #include "BLO_readfile.h"
@@ -945,4 +946,60 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
+
+	if (!DNA_struct_find(fd->filesdna, "SpaceTopBar")) {
+		/* Remove info editor, but only if at the top of the window. */
+		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+			/* Calculate window width/height from screen vertices */
+			int win_width = 0, win_height = 0;
+			for (ScrVert *vert = screen->vertbase.first; vert; vert = vert->next) {
+				win_width  = MAX2(win_width, vert->vec.x);
+				win_height = MAX2(win_height, vert->vec.y);
+			}
+
+			for (ScrArea *area = screen->areabase.first, *area_next; area; area = area_next) {
+				area_next = area->next;
+
+				if (area->spacetype == SPACE_INFO) {
+					if ((area->v2->vec.y == win_height) && (area->v1->vec.x == 0) && (area->v4->vec.x == win_width)) {
+						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 */
+			}
+		}
+	}
+
+#ifdef WITH_REDO_REGION_REMOVAL
+	if (!MAIN_VERSION_ATLEAST(main, 280, TO_BE_DETERMINED)) {
+		/* Remove tool property regions. */
+		for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
+			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+					if (ELEM(sl->spacetype, SPACE_VIEW3D, SPACE_CLIP)) {
+						ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+
+						for (ARegion *region = regionbase->first, *region_next; region; region = region_next) {
+							region_next = region->next;
+
+							if (region->regiontype == RGN_TYPE_TOOL_PROPS) {
+								BKE_area_region_free(NULL, region);
+								BLI_freelinkN(regionbase, region);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+#endif
 }