diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-01-06 23:16:06 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-01-06 23:16:06 +0300 |
commit | 36e03e5ca8278bf68ebf42c412ab727d43215654 (patch) | |
tree | 8cdea534706a9d92d1cae9e22780fe240091b268 /source/blender/blenloader | |
parent | 6128b510234bc67d10b55aed9fbb66f304d7c849 (diff) |
Potential fix for bug #5359:
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.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 8343f8db9ad..e2f11d5011e 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -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); - } } } |