[Bf-blender-cvs] [ce0fcf1378b] master: Correct error in last commit (versioning)

[Campbell Barton]

Commit: ce0fcf1378b6bdd01ff8fbcbccc31b00aa263e25
Author: Campbell Barton
Date:   Tue Jan 9 15:17:00 2018 +1100
Branches: master
https://developer.blender.org/rBce0fcf1378b6bdd01ff8fbcbccc31b00aa263e25

Correct error in last commit (versioning)

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

M	source/blender/blenloader/intern/versioning_270.c

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

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 20475582bc9..c56b25bb669 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1735,29 +1735,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 279, 1)) {
-		/* Simple deform modifier no longer assumes Z axis (X for bend type).
-		 * Must set previous defaults. */
-		if (!DNA_struct_elem_find(fd->filesdna, "SimpleDeformModifierData", "char", "deform_axis")) {
-			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
-				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
-					if (md->type == eModifierType_SimpleDeform) {
-						SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
-						switch (smd->mode) {
-							case MOD_SIMPLEDEFORM_MODE_BEND:
-								smd->deform_axis = 0;
-								break;
-							default:
-								smd->deform_axis = 2;
-								break;
-						}
-					}
-				}
-			}
-		}
-	}
-
-
 	{
 		/* Fix for invalid state of screen due to bug in older versions. */
 		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {
@@ -1788,6 +1765,26 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 				}
 			}
 		}
+
+		/* Simple deform modifier no longer assumes Z axis (X for bend type).
+		 * Must set previous defaults. */
+		if (!DNA_struct_elem_find(fd->filesdna, "SimpleDeformModifierData", "char", "deform_axis")) {
+			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+				for (ModifierData *md = ob->modifiers.first; md; md = md->next) {
+					if (md->type == eModifierType_SimpleDeform) {
+						SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
+						switch (smd->mode) {
+							case MOD_SIMPLEDEFORM_MODE_BEND:
+								smd->deform_axis = 0;
+								break;
+							default:
+								smd->deform_axis = 2;
+								break;
+						}
+					}
+				}
+			}
+		}
 	}
 }