diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-08-31 16:07:51 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-08-31 16:15:09 +0300 |
| commit | 3ecb21346248014aff621ec3b97ccbc1e7774653 (patch) | |
| tree | b571a51b93d61efc01bf8a75a74ecade8e463d16 /source/blender/blenkernel/intern/mesh_convert.cc | |
| parent | b5af7f967e6d5d2e7432d6efa2f47050a5bfc576 (diff) | |
| parent | 773241add9d876aa0b4ba011745208f61b53a4e2 (diff) | |
Merge branch 'master' into refactor-mesh-material-index-genericrefactor-mesh-material-index-generic
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_convert.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 0f05a3635c4..393d54bb03e 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -199,7 +199,7 @@ static Mesh *mesh_nurbs_displist_to_mesh(const Curve *cu, const ListBase *dispba SpanAttributeWriter<int> material_indices = attributes.lookup_or_add_for_write_only_span<int>( "material_index", ATTR_DOMAIN_FACE); MLoopUV *mloopuv = static_cast<MLoopUV *>(CustomData_add_layer_named( - &mesh->ldata, CD_MLOOPUV, CD_CALLOC, nullptr, mesh->totloop, "UVMap")); + &mesh->ldata, CD_MLOOPUV, CD_SET_DEFAULT, nullptr, mesh->totloop, "UVMap")); /* verts and faces */ vertcount = 0; @@ -682,7 +682,8 @@ void BKE_mesh_from_pointcloud(const PointCloud *pointcloud, Mesh *me) &pointcloud->pdata, &me->vdata, CD_MASK_PROP_ALL, CD_DUPLICATE, pointcloud->totpoint); /* Convert the Position attribute to a mesh vertex. */ - me->mvert = (MVert *)CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, nullptr, me->totvert); + me->mvert = (MVert *)CustomData_add_layer( + &me->vdata, CD_MVERT, CD_SET_DEFAULT, nullptr, me->totvert); CustomData_update_typemap(&me->vdata); const int layer_idx = CustomData_get_named_layer_index( |