diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-04 23:43:01 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-02-04 23:43:01 +0300 |
| commit | 4e27f638286ea011ed4ddf6e6ec0f419ac01ab4a (patch) | |
| tree | f04ed697bf7ec64c5d519b7a752c8adce194725c /source/blender/blenkernel/intern/multires.c | |
| parent | 37ae32870e48479abd730f0706f7e69f07b4a6cc (diff) | |
Fix T43560: crash when loading old (2.45 here) file whith multires.
Was trying to free a NULL pointer...
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
| -rw-r--r-- | source/blender/blenkernel/intern/multires.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 0adc65bd806..220d0f7c604 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1641,7 +1641,8 @@ void multires_free(Multires *mr) lvl = lvl->next; } - MEM_freeN(mr->verts); + /* mr->verts may be NULL when loading old files, see direct_link_mesh() in readfile.c, and T43560. */ + MEM_SAFE_FREE(mr->verts); BLI_freelistN(&mr->levels); |