[Bf-blender-cvs] [d35974cd870] blender-v2.83-release: Fix T87055: Crash applying modifier on mesh with multires data

[Campbell Barton]

Commit: d35974cd870b0caf5292f1188bef10881685c480
Author: Campbell Barton
Date:   Tue Apr 20 15:10:43 2021 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBd35974cd870b0caf5292f1188bef10881685c480

Fix T87055: Crash applying modifier on mesh with multires data

===================================================================

M	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 2b9a4b41549..12b5515748d 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1540,6 +1540,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);
+      }
     }
   }