From 72fec0f7c5865a30aa348bc6e76271ba9a5a606e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 20 Apr 2021 15:10:43 +1000 Subject: Fix T87055: Crash applying modifier on mesh with multires data --- source/blender/blenkernel/intern/mesh_convert.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/blenkernel/intern/mesh_convert.c') diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 385fd473e63..a4122dcca41 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -1634,6 +1634,10 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, if (totloop == mesh_dst->totloop) { MDisps *mdisps = CustomData_get_layer(&mesh_dst->ldata, CD_MDISPS); CustomData_add_layer(&tmp.ldata, CD_MDISPS, alloctype, mdisps, totloop); + if (alloctype == CD_ASSIGN) { + /* Assign NULL to prevent double-free. */ + CustomData_set_layer(&mesh_dst->ldata, CD_MDISPS, NULL); + } } } -- cgit v1.2.3