Commit: 4e27f638286ea011ed4ddf6e6ec0f419ac01ab4a
Author: Bastien Montagne
Date: Wed Feb 4 21:43:01 2015 +0100
Branches: master
https://developer.blender.org/rB4e27f638286ea011ed4ddf6e6ec0f419ac01ab4a
Fix T43560: crash when loading old (2.45 here) file whith multires.
Was trying to free a NULL pointer...
===================================================================
M source/blender/blenkernel/intern/multires.c
===================================================================
diff --git a/source/blender/blenkernel/intern/multires.c
b/source/blender/blenkernel/intern/multires.c
index 0adc65b..220d0f7 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
