Merged back with last version where collisions worked at least a bit (rev 12296). Also merged fixes (hopefully).

2 files changed, 6 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d215bdf67cd..37d15b65de5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2986,12 +2986,14 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 		   ClothModifierData	*clmd = (ClothModifierData*) md;
 
 		   clmd->clothObject = NULL;
-		   
+		   /*
 		   clmd->sim_parms= newdataadr(fd, clmd->sim_parms);
 		   clmd->coll_parms= newdataadr(fd, clmd->coll_parms);
+		   */
 		   
 		} 
 		else if (md->type==eModifierType_Collision) {
+			/*
 			CollisionModifierData *collmd = (CollisionModifierData*) md;
 			
 			collmd->x = NULL;
@@ -3001,6 +3003,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 			collmd->time = -1;
 			collmd->numverts = 0;
 			collmd->tree = NULL;
+			*/
 		}
 		else if (md->type==eModifierType_Hook) {
 			HookModifierData *hmd = (HookModifierData*) md;
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 275e3b18c4c..3326d38c56f 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -827,8 +827,10 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 		}
 		else if(md->type==eModifierType_Cloth) {
 			ClothModifierData *clmd = (ClothModifierData*) md;
+			/*
 			writestruct(wd, DATA, "SimulationSettings", 1, clmd->sim_parms);
 			writestruct(wd, DATA, "CollisionSettings", 1, clmd->coll_parms);
+			*/
 		} 
 		else if (md->type==eModifierType_MeshDeform) {
 			MeshDeformModifierData *mmd = (MeshDeformModifierData*) md;