diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-04-20 08:21:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-20 08:21:25 +0300 |
| commit | b760481f8df81b3ae6f915f1b303bb1c206811eb (patch) | |
| tree | 91f4ad687e24d09f7eeb219f520d98497694fb02 /source/blender/blenkernel | |
| parent | 7ccd19fc1288f64393f64b3249497c919f5f0a04 (diff) | |
| parent | 72fec0f7c5865a30aa348bc6e76271ba9a5a606e (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); + } } } |