2 files changed, 69 insertions, 29 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 2b6c372861a..c937dfd88a4 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2929,13 +2929,21 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache)
 {
 	if((cache->flag & PTCACHE_DISK_CACHE)==0) {
 		PTCacheMem *pm;
+		int i;
 
 		link_list(fd, &cache->mem_cache);
 
 		pm = cache->mem_cache.first;
 
-		for(; pm; pm=pm->next)
-			pm->data = newdataadr(fd, pm->data);
+		for(; pm; pm=pm->next) {
+			if(pm->index_array)
+				pm->index_array = newdataadr(fd, pm->index_array);
+			
+			for(i=0; i<BPHYS_TOT_DATA; i++) {
+				if(pm->data[i] && pm->data_types & (1<<i))
+					pm->data[i] = newdataadr(fd, pm->data[i]);
+			}
+		}
 	}
 	else
 		cache->mem_cache.first = cache->mem_cache.last = NULL;
@@ -2944,6 +2952,24 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache)
 	cache->simframe= 0;
 }
 
+static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache)
+{
+	PointCache *cache;
+
+	if(ptcaches->first) {
+		link_list(fd, ptcaches);
+		for(cache=ptcaches->first; cache; cache=cache->next)
+			direct_link_pointcache(fd, cache);
+
+		*ocache = newdataadr(fd, *ocache);
+	}
+	else if(*ocache) {
+		/* old "single" caches need to be linked too for do-versions */
+		*ocache = newdataadr(fd, *ocache);
+		direct_link_pointcache(fd, *ocache);
+	}
+}
+
 static void lib_link_particlesettings(FileData *fd, Main *main)
 {
 	ParticleSettings *part;
@@ -3089,9 +3115,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 			sb->bspring= NULL;
 			sb->scratch= NULL;
 
-			sb->pointcache= newdataadr(fd, sb->pointcache);
-			if(sb->pointcache)
-				direct_link_pointcache(fd, sb->pointcache);
+			direct_link_pointcache_list(fd, &sb->ptcaches, &sb->pointcache);
 		}
 
 		link_list(fd, &psys->targets);
@@ -3104,9 +3128,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles)
 		psys->childcachebufs.first = psys->childcachebufs.last = 0;
 		psys->reactevents.first = psys->reactevents.last = 0;
 
-		psys->pointcache= newdataadr(fd, psys->pointcache);
-		if(psys->pointcache)
-			direct_link_pointcache(fd, psys->pointcache);
+		direct_link_pointcache_list(fd, &psys->ptcaches, &psys->pointcache);
 
 		psys->tree = NULL;
 	}
@@ -3630,8 +3652,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 			clmd->coll_parms= newdataadr(fd, clmd->coll_parms);
 			clmd->point_cache= newdataadr(fd, clmd->point_cache);
 
-			if(clmd->point_cache)
-				direct_link_pointcache(fd, clmd->point_cache);
+			direct_link_pointcache_list(fd, &clmd->ptcaches, &clmd->point_cache);
 			
 			if(clmd->sim_parms) {
 				if(clmd->sim_parms->presets > 10)
@@ -3888,7 +3909,7 @@ static void direct_link_object(FileData *fd, Object *ob)
 
 		sb->pointcache= newdataadr(fd, sb->pointcache);
 		if(sb->pointcache)
-			direct_link_pointcache(fd, sb->pointcache);
+			direct_link_pointcache_list(fd, &sb->ptcaches, &sb->pointcache);
 	}
 	ob->bsoft= newdataadr(fd, ob->bsoft);
 	ob->fluidsimSettings= newdataadr(fd, ob->fluidsimSettings); /* NT */
@@ -8301,20 +8322,20 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		/* add point caches */
 		for(ob=main->object.first; ob; ob=ob->id.next) {
 			if(ob->soft && !ob->soft->pointcache)
-				ob->soft->pointcache= BKE_ptcache_add();
+				ob->soft->pointcache= BKE_ptcache_add(&ob->soft->ptcaches);
 
 			for(psys=ob->particlesystem.first; psys; psys=psys->next) {
 				if(psys->soft && !psys->soft->pointcache)
-					psys->soft->pointcache= BKE_ptcache_add();
+					psys->soft->pointcache= BKE_ptcache_add(&psys->soft->ptcaches);
 				if(!psys->pointcache)
-					psys->pointcache= BKE_ptcache_add();
+					psys->pointcache= BKE_ptcache_add(&psys->ptcaches);
 			}
 
 			for(md=ob->modifiers.first; md; md=md->next) {
 				if(md->type==eModifierType_Cloth) {
 					ClothModifierData *clmd = (ClothModifierData*) md;
 					if(!clmd->point_cache)
-						clmd->point_cache= BKE_ptcache_add();
+						clmd->point_cache= BKE_ptcache_add(&clmd->ptcaches);
 				}
 			}
 		}
@@ -8602,7 +8623,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 				/* create new particle system */
 				psys = MEM_callocN(sizeof(ParticleSystem), "particle_system");
-				psys->pointcache = BKE_ptcache_add();
+				psys->pointcache = BKE_ptcache_add(&psys->ptcaches);
 
 				part = psys->part = psys_new_settings("ParticleSettings", main);
 				
@@ -9344,9 +9365,19 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		Tex *tex;
 		Scene *sce;
 		ToolSettings *ts;
+		PTCacheID *pid;
+		ListBase pidlist;
 		int i, a;
 
 		for(ob = main->object.first; ob; ob = ob->id.next) {
+			BKE_ptcache_ids_from_object(&pidlist, ob);
+
+			for(pid=pidlist.first; pid; pid=pid->next) {
+				if(pid->ptcaches->first == NULL)
+					pid->ptcaches->first = pid->ptcaches->last = pid->cache;
+			}
+
+			BLI_freelistN(&pidlist);
 
 			if(ob->type == OB_MESH) {
 				Mesh *me = newlibadr(fd, lib, ob->data);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index cf636cc2b94..d8841962e7b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -157,6 +157,7 @@ Any case: direct data is ALWAYS after the lib block
 #include "BKE_main.h"
 #include "BKE_node.h"
 #include "BKE_packedFile.h" // for packAll
+#include "BKE_pointcache.h"
 #include "BKE_report.h"
 #include "BKE_screen.h" // for waitcursor
 #include "BKE_sequence.h"
@@ -582,19 +583,27 @@ static void write_boid_state(WriteData *wd, BoidState *state)
 /* TODO: replace *cache with *cachelist once it's coded */
 #define PTCACHE_WRITE_PSYS	0
 #define PTCACHE_WRITE_CLOTH	1
-static void write_pointcaches(WriteData *wd, PointCache *cache, int type)
+static void write_pointcaches(WriteData *wd, ListBase *ptcaches)
 {
-	writestruct(wd, DATA, "PointCache", 1, cache);
+	PointCache *cache = ptcaches->first;
+	int i;
+
+	for(; cache; cache=cache->next) {
+		writestruct(wd, DATA, "PointCache", 1, cache);
 
-	if((cache->flag & PTCACHE_DISK_CACHE)==0) {
-		PTCacheMem *pm = cache->mem_cache.first;
+		if((cache->flag & PTCACHE_DISK_CACHE)==0) {
+			PTCacheMem *pm = cache->mem_cache.first;
 
-		for(; pm; pm=pm->next) {
-			writestruct(wd, DATA, "PTCacheMem", 1, pm);
-			if(type==PTCACHE_WRITE_PSYS)
-				writestruct(wd, DATA, "ParticleKey", pm->totpoint, pm->data);
-			else if(type==PTCACHE_WRITE_CLOTH)
-				writedata(wd, DATA, 9 * sizeof(float) * pm->totpoint, pm->data);
+			for(; pm; pm=pm->next) {
+				writestruct(wd, DATA, "PTCacheMem", 1, pm);
+				if(pm->index_array)
+					writedata(wd, DATA, sizeof(int) * pm->totpoint, pm->index_array);
+				
+				for(i=0; i<BPHYS_TOT_DATA; i++) {
+					if(pm->data[i] && pm->data_types & (1<<i))
+						writedata(wd, DATA, BKE_ptcache_data_size(i) * pm->totpoint, pm->data[i]);
+				}
+			}
 		}
 	}
 }
@@ -652,8 +661,8 @@ static void write_particlesystems(WriteData *wd, ListBase *particles)
 
 		if(psys->child) writestruct(wd, DATA, "ChildParticle", psys->totchild ,psys->child);
 		writestruct(wd, DATA, "SoftBody", 1, psys->soft);
-		if(psys->soft) write_pointcaches(wd, psys->soft->pointcache, PTCACHE_WRITE_PSYS);
-		write_pointcaches(wd, psys->pointcache, PTCACHE_WRITE_PSYS);
+		if(psys->soft) write_pointcaches(wd, &psys->soft->ptcaches);
+		write_pointcaches(wd, &psys->ptcaches);
 	}
 }
 
@@ -1112,7 +1121,7 @@ static void write_modifiers(WriteData *wd, ListBase *modbase, int write_undo)
 			
 			writestruct(wd, DATA, "ClothSimSettings", 1, clmd->sim_parms);
 			writestruct(wd, DATA, "ClothCollSettings", 1, clmd->coll_parms);
-			write_pointcaches(wd, clmd->point_cache, PTCACHE_WRITE_CLOTH);
+			write_pointcaches(wd, &clmd->ptcaches);
 		} 
 		else if(md->type==eModifierType_Smoke) {
 			SmokeModifierData *smd = (SmokeModifierData*) md;