archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Multires ==

Browse Source 
Fixed bug #6358, UV face select + Multires level change crashes

* Reading in multires files wasn't relinking the MTFace customdata stored for level 1. This was leaving tpage as a bad pointer.
This commit is contained in:
Nicholas Bishop
2007-04-02 00:52:38 +00:00
parent 2d1ef13962
commit dca213525a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2427,6 +2427,18 @@ static void lib_link_mtface(FileData *fd, Mesh *me, MTFace *mtface, int totface)
} }
} }
static void lib_link_customdata_mtface(FileData *fd, Mesh *me, CustomData *fdata, int totface)
{
int i;
for(i=0; i<fdata->totlayer; i++) {
CustomDataLayer *layer = &fdata->layers[i];
if(layer->type == CD_MTFACE)
lib_link_mtface(fd, me, layer->data, totface);
}
}
static void lib_link_mesh(FileData *fd, Main *main) static void lib_link_mesh(FileData *fd, Main *main)
{ {
Mesh *me; Mesh *me;
@@ -2452,12 +2464,11 @@ static void lib_link_mesh(FileData *fd, Main *main)
me->key= newlibadr_us(fd, me->id.lib, me->key); me->key= newlibadr_us(fd, me->id.lib, me->key);
me->texcomesh= newlibadr_us(fd, me->id.lib, me->texcomesh); me->texcomesh= newlibadr_us(fd, me->id.lib, me->texcomesh);
for(i=0; i<me->fdata.totlayer; i++) { lib_link_customdata_mtface(fd, me, &me->fdata, me->totface);
CustomDataLayer *layer = &me->fdata.layers[i]; if(me->mr && me->mr->levels.first)
lib_link_customdata_mtface(fd, me, &me->mr->fdata,
((MultiresLevel*)me->mr->levels.first)->totface);
if(layer->type == CD_MTFACE)
lib_link_mtface(fd, me, layer->data, me->totface);
}
me->id.flag -= LIB_NEEDLINK; me->id.flag -= LIB_NEEDLINK;
} }
me= me->id.next; me= me->id.next;