kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

2.5

Browse Source 
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!
This commit is contained in:
Ton Roosendaal 2009-08-12 13:07:12 +00:00
parent 020ee171b7
commit fcf883ecf9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenloader/intern/readfile.c
View File

@ -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);