svn merge ^/trunk/blender -r44118:44136

1 files changed, 10 insertions, 12 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index cee6e50ba5f..a0811fb0fcd 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -13136,20 +13136,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 		}
 	}
-	
-	/* put compatibility code here until next subversion bump */
+
+	if (main->versionfile < 262)
 	{
-		{
-			Object *ob;
-			for(ob=main->object.first; ob; ob= ob->id.next) {
-				ModifierData *md;
+		Object *ob;
+		for(ob=main->object.first; ob; ob= ob->id.next) {
+			ModifierData *md;
 
-				for (md=ob->modifiers.first; md; md=md->next) {
-					if (md->type==eModifierType_Cloth) {
-						ClothModifierData *clmd = (ClothModifierData*) md;
-						if(clmd->sim_parms)
-							clmd->sim_parms->vel_damping = 1.0f;
-					}
+			for (md=ob->modifiers.first; md; md=md->next) {
+				if (md->type==eModifierType_Cloth) {
+					ClothModifierData *clmd = (ClothModifierData*) md;
+					if(clmd->sim_parms)
+						clmd->sim_parms->vel_damping = 1.0f;
 				}
 			}
 		}