From fcf883ecf9b90ca859c3fe692dffe4eb37e5e75d Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 12 Aug 2009 13:07:12 +0000 Subject: 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! --- source/blender/blenloader/intern/readfile.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c937dfd88a4..3b53e5b32cb 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9344,12 +9344,12 @@ static void do_versions(FileData *fd, Library *lib, Main *main) /* 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 @@ static void do_versions(FileData *fd, Library *lib, Main *main) 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); -- cgit v1.2.3