diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-23 17:58:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-23 17:58:41 +0300 |
commit | e32b676bafe746dc3503e5d5b4761cbadd7210e4 (patch) | |
tree | c3570b3cc709ad1620b659c510ad3502eb869321 /source/blender/blenkernel/intern/data_transfer.c | |
parent | 1361c6e60460b0db1d0b6878a7043940afd25ad7 (diff) | |
parent | 398538b914a3c7ff3cf845f4fe6b2bdbb47204cb (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer.c')
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index c4ae4c4a36c..1818e5a9490 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -263,7 +263,6 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src, /* This should be ensured by cddata_masks we pass to code generating/giving us me_src now. */ BLI_assert(CustomData_get_layer(&me_src->ldata, CD_NORMAL) != NULL); - BLI_assert(CustomData_get_layer(&me_src->pdata, CD_NORMAL) != NULL); (void)me_src; float(*loop_nors_dst)[3]; @@ -318,15 +317,12 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src), const int num_polys_dst = me_dst->totpoly; MLoop *loops_dst = me_dst->mloop; const int num_loops_dst = me_dst->totloop; - CustomData *pdata_dst = &me_dst->pdata; CustomData *ldata_dst = &me_dst->ldata; - const float(*poly_nors_dst)[3] = CustomData_get_layer(pdata_dst, CD_NORMAL); + const float(*poly_nors_dst)[3] = BKE_mesh_poly_normals_ensure(me_dst); float(*loop_nors_dst)[3] = CustomData_get_layer(ldata_dst, CD_NORMAL); short(*custom_nors_dst)[2] = CustomData_get_layer(ldata_dst, CD_CUSTOMLOOPNORMAL); - BLI_assert(poly_nors_dst); - if (!custom_nors_dst) { custom_nors_dst = CustomData_add_layer( ldata_dst, CD_CUSTOMLOOPNORMAL, CD_CALLOC, NULL, num_loops_dst); |