svn merge ^/trunk/blender -r43616:43639

1 files changed, 14 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 91d85d4519f..c11d9411821 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -13118,6 +13118,20 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	
 	/* put compatibility code here until next subversion bump */
 	{
+		{
+			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;
+					}
+				}
+			}
+		}
 	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */