diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-10-20 11:48:05 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-10-20 17:22:36 +0300 |
| commit | 239eb95ef879088d690eec331619c3ddabc595aa (patch) | |
| tree | 6bf0c7c2ce3d8a07fa426b5d0fa7c4aa024aaa6f /source | |
| parent | 1c08ab45357ca0884107bbc5e159097c9c58cc19 (diff) | |
Fix T81865, T81860: CustomData Correction can fail on non standard names
Caused by rBaafd71a8a160.
In the process of CustomData Correction, we need to make sure we also
have matching layer names [as was done before above commit], otherwise
this will create layers with default names, applying
(mesh_customdatacorrect_apply and friends) will fail then.
Maniphest Tasks: T81865
Differential Revision: https://developer.blender.org/D9278
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 2e69c48708c..ca5693aa5ba 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -641,7 +641,8 @@ void BM_mesh_copy_init_customdata_all_layers(BMesh *bm_dst, const int size = *(&allocsize->totvert + i); for (int l = 0; l < src->totlayer; l++) { - CustomData_add_layer(dst, src->layers[l].type, CD_CALLOC, NULL, 0); + CustomData_add_layer_named( + dst, src->layers[l].type, CD_CALLOC, NULL, 0, src->layers[l].name); } CustomData_bmesh_init_pool(dst, size, htypes[i]); } |