[Bf-blender-cvs] [27c72e22aa4] master: Cleanup: fix some versioning code running when not needed.

[Brecht Van Lommel]

Commit: 27c72e22aa41e13cb94bb3e5f9a59b960ba5aa09
Author: Brecht Van Lommel
Date:   Wed Feb 20 15:30:50 2019 +0100
Branches: master
https://developer.blender.org/rB27c72e22aa41e13cb94bb3e5f9a59b960ba5aa09

Cleanup: fix some versioning code running when not needed.

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

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 9cb63e773cd..07fae75974f 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2057,9 +2057,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				}
 			}
 		}
-	}
 
-	{
 		if (!DNA_struct_elem_find(fd->filesdna, "ShrinkwrapModifierData", "char", "shrinkMode")) {
 			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
@@ -2073,9 +2071,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				}
 			}
 		}
-	}
 
-	if (!MAIN_VERSION_ATLEAST(bmain, 280, 24)) {
 		if (!DNA_struct_elem_find(fd->filesdna, "PartDeflect", "float", "pdef_cfrict")) {
 			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
 				if (ob->pd) {
@@ -2135,7 +2131,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 		}
 	}
 
-	{
+	if (!MAIN_VERSION_ATLEAST(bmain, 280, 29)) {
 		for (bScreen *screen = bmain->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) {
@@ -2150,9 +2146,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				}
 			}
 		}
-	}
 
-	if (!MAIN_VERSION_ATLEAST(bmain, 280, 29)) {
 		for (bScreen *screen = bmain->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) {