[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22403] branches/blender2.5/blender/source /blender/blenloader/intern/readfile.c: 2.5

[Ton Roosendaal]

Revision: 22403
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22403
Author:   ton
Date:     2009-08-12 15:07:12 +0200 (Wed, 12 Aug 2009)

Log Message:
-----------
2.5

Removed BKE_ptcache_ids_from_object() from readfile.c do_versions,
this cannot work... IDs are not set for versioning. Will need to go
over this with janne what he actually wants to achieve here...

This solves crash on startup of Blender. Tsk!

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-12 12:17:41 UTC (rev 22402)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-12 13:07:12 UTC (rev 22403)
@@ -9344,12 +9344,12 @@
 		/* set old pointcaches to have disk cache flag */
 		for(ob = main->object.first; ob; ob= ob->id.next) {
 
-			BKE_ptcache_ids_from_object(&pidlist, ob);
+			//BKE_ptcache_ids_from_object(&pidlist, ob);
 
-			for(pid=pidlist.first; pid; pid=pid->next)
-				pid->cache->flag |= PTCACHE_DISK_CACHE;
+			//for(pid=pidlist.first; pid; pid=pid->next)
+			//	pid->cache->flag |= PTCACHE_DISK_CACHE;
 
-			BLI_freelistN(&pidlist);
+			//BLI_freelistN(&pidlist);
 		}
 	}
 
@@ -9370,14 +9370,14 @@
 		int i, a;
 
 		for(ob = main->object.first; ob; ob = ob->id.next) {
-			BKE_ptcache_ids_from_object(&pidlist, ob);
+			//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;
-			}
+			//for(pid=pidlist.first; pid; pid=pid->next) {
+			//	if(pid->ptcaches->first == NULL)
+			//		pid->ptcaches->first = pid->ptcaches->last = pid->cache;
+			//}
 
-			BLI_freelistN(&pidlist);
+			//BLI_freelistN(&pidlist);
 
 			if(ob->type == OB_MESH) {
 				Mesh *me = newlibadr(fd, lib, ob->data);