From 4e27f638286ea011ed4ddf6e6ec0f419ac01ab4a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 4 Feb 2015 21:43:01 +0100 Subject: Fix T43560: crash when loading old (2.45 here) file whith multires. Was trying to free a NULL pointer... --- source/blender/blenkernel/intern/multires.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/multires.c') 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); -- cgit v1.2.3