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

Potential fix for bug #5359:

Browse Source 
Crash leaving editmode related to vertex groups. I couldn't reproduce this,
but suspect somehow multiple deformvert layers were created. Added some
extra checks to avoid that now.
This commit is contained in:
Brecht Van Lommel 2007-01-06 20:16:06 +00:00
parent 6128b51023
commit 36e03e5ca8
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_customdata.h
View File

@ -221,4 +221,8 @@ const char *CustomData_layertype_name(int type);
/* make sure the name of layer at index is unique */
void CustomData_set_layer_unique_name(struct CustomData *data, int index);
/* for file reading compatibility, returns false if the layer was freed,
only after this test passes, layer->data should be assigned */
int CustomData_verify_versions(struct CustomData *data, int index);
#endif

30
source/blender/blenkernel/intern/customdata.c
View File

@ -567,6 +567,9 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data,
int size = typeInfo->size * totelem, flag = 0, index = data->totlayer;
void *newlayerdata;
if (!typeInfo->defaultname && CustomData_has_layer(data, type))
return &data->layers[CustomData_get_layer_index(data, type)];
if((alloctype == CD_ASSIGN) || (alloctype == CD_REFERENCE)) {
newlayerdata = layerdata;
}
@ -644,7 +647,6 @@ void *CustomData_add_layer_named(CustomData *data, int type, int alloctype,
void *layerdata, int totelem, char *name)
{
CustomDataLayer *layer;
const LayerTypeInfo *typeInfo= layerType_getInfo(type);
layer = customData_add_layer__internal(data, type, alloctype, layerdata,
totelem, name);
@ -1289,3 +1291,29 @@ void CustomData_set_layer_unique_name(CustomData *data, int index)
}
}
int CustomData_verify_versions(struct CustomData *data, int index)
{
const LayerTypeInfo *typeInfo;
CustomDataLayer *layer = &data->layers[index];
int i, keeplayer = 1;
if (layer->type >= CD_NUMTYPES) {
keeplayer = 0; /* unknown layer type from future version */
}
else {
typeInfo = layerType_getInfo(layer->type);
if (!typeInfo->defaultname && (index > 0) &&
data->layers[index-1].type == layer->type)
keeplayer = 0; /* multiple layers of which we only support one */
}
if (!keeplayer) {
for (i=index+1; i < data->totlayer; ++i)
data->layers[i-1] = data->layers[i];
data->totlayer--;
}
return keeplayer;
}

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

@ -2487,15 +2487,10 @@ static void direct_link_customdata(FileData *fd, CustomData *data, int count)
while (i < data->totlayer) {
CustomDataLayer *layer = &data->layers[i];
if (layer->type < CD_NUMTYPES) {
if (CustomData_verify_versions(data, i)) {
layer->data = newdataadr(fd, layer->data);
i++;
}
else {
/* delete layers with unknown type */
layer->data = NULL;
CustomData_free_layers(data, layer->type, 0);
}
}
}