diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-07 08:06:31 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-07 08:06:31 +0300 |
| commit | be038b844cb53bc228d3e98bfe09071560930cde (patch) | |
| tree | 13de4a3fc3b49a8b2075a0413dc8261603fbc718 | |
| parent | 20daaeffce4cf9bfe48ab7c84cb9e2b1d71d2c91 (diff) | |
Cleanup: Tweak naming for recently added mesh accessors
Use `verts` instead of `vertices` and `polys` instead of `polygons`
in the API added in 05952aa94d33eeb50. This aligns better with
existing naming where the shorter names are much more common.
174 files changed, 673 insertions, 679 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index eb54861e79c..a5b0e21f0ca 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -1054,11 +1054,11 @@ BLI_INLINE int *BKE_mesh_material_indices_for_write(Mesh *mesh) &mesh->pdata, CD_PROP_INT32, CD_SET_DEFAULT, NULL, mesh->totpoly, "material_index"); } -BLI_INLINE const MVert *BKE_mesh_vertices(const Mesh *mesh) +BLI_INLINE const MVert *BKE_mesh_verts(const Mesh *mesh) { return (const MVert *)CustomData_get_layer(&mesh->vdata, CD_MVERT); } -BLI_INLINE MVert *BKE_mesh_vertices_for_write(Mesh *mesh) +BLI_INLINE MVert *BKE_mesh_verts_for_write(Mesh *mesh) { return (MVert *)CustomData_duplicate_referenced_layer(&mesh->vdata, CD_MVERT, mesh->totvert); } @@ -1072,11 +1072,11 @@ BLI_INLINE MEdge *BKE_mesh_edges_for_write(Mesh *mesh) return (MEdge *)CustomData_duplicate_referenced_layer(&mesh->edata, CD_MEDGE, mesh->totedge); } -BLI_INLINE const MPoly *BKE_mesh_polygons(const Mesh *mesh) +BLI_INLINE const MPoly *BKE_mesh_polys(const Mesh *mesh) { return (const MPoly *)CustomData_get_layer(&mesh->pdata, CD_MPOLY); } -BLI_INLINE MPoly *BKE_mesh_polygons_for_write(Mesh *mesh) +BLI_INLINE MPoly *BKE_mesh_polys_for_write(Mesh *mesh) { return (MPoly *)CustomData_duplicate_referenced_layer(&mesh->pdata, CD_MPOLY, mesh->totpoly); } @@ -1113,13 +1113,13 @@ BLI_INLINE MDeformVert *BKE_mesh_deform_verts_for_write(Mesh *mesh) # include "BLI_span.hh" -inline blender::Span<MVert> Mesh::vertices() const +inline blender::Span<MVert> Mesh::verts() const { - return {BKE_mesh_vertices(this), this->totvert}; + return {BKE_mesh_verts(this), this->totvert}; } -inline blender::MutableSpan<MVert> Mesh::vertices_for_write() +inline blender::MutableSpan<MVert> Mesh::verts_for_write() { - return {BKE_mesh_vertices_for_write(this), this->totvert}; + return {BKE_mesh_verts_for_write(this), this->totvert}; } inline blender::Span<MEdge> Mesh::edges() const @@ -1131,13 +1131,13 @@ inline blender::MutableSpan<MEdge> Mesh::edges_for_write() return {BKE_mesh_edges_for_write(this), this->totedge}; } -inline blender::Span<MPoly> Mesh::polygons() const +inline blender::Span<MPoly> Mesh::polys() const { - return {BKE_mesh_polygons(this), this->totpoly}; + return {BKE_mesh_polys(this), this->totpoly}; } -inline blender::MutableSpan<MPoly> Mesh::polygons_for_write() +inline blender::MutableSpan<MPoly> Mesh::polys_for_write() { - return {BKE_mesh_polygons_for_write(this), this->totpoly}; + return {BKE_mesh_polys_for_write(this), this->totpoly}; } inline blender::Span<MLoop> Mesh::loops() const diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 46a8caafa70..c282305af5b 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -2003,7 +2003,7 @@ void mesh_get_mapped_verts_coords(Mesh *me_eval, float (*r_cos)[3], const int to MEM_freeN(userData.vertex_visit); } else { - const Span<MVert> verts = me_eval->vertices(); + const Span<MVert> verts = me_eval->verts(); for (int i = 0; i < totcos; i++) { copy_v3_v3(r_cos[i], verts[i].co); } @@ -2018,8 +2018,8 @@ static void mesh_init_origspace(Mesh *mesh) CD_ORIGSPACE_MLOOP); const int numpoly = mesh->totpoly; // const int numloop = mesh->totloop; - const Span<MVert> verts = mesh->vertices(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MVert> verts = mesh->verts(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); const MPoly *mp = polys.data(); diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc index d33ff933004..1d8b53a28ba 100644 --- a/source/blender/blenkernel/intern/bvhutils.cc +++ b/source/blender/blenkernel/intern/bvhutils.cc @@ -1231,7 +1231,7 @@ BVHTree *BKE_bvhtree_from_mesh_get(struct BVHTreeFromMesh *data, looptri = BKE_mesh_runtime_looptri_ensure(mesh); looptri_len = BKE_mesh_runtime_looptri_len(mesh); } - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); const Span<MEdge> edges = mesh->edges(); const Span<MLoop> loops = mesh->loops(); @@ -1296,7 +1296,7 @@ BVHTree *BKE_bvhtree_from_mesh_get(struct BVHTreeFromMesh *data, case BVHTREE_FROM_LOOPTRI_NO_HIDDEN: { blender::bke::AttributeAccessor attributes = blender::bke::mesh_attributes(*mesh); mask = looptri_no_hidden_map_get( - mesh->polygons().data(), + mesh->polys().data(), attributes.lookup_or_default(".hide_poly", ATTR_DOMAIN_FACE, false), looptri_len, &mask_bits_act_len); diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index ef3d71cdacf..f3bda8b1c99 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -258,7 +258,7 @@ static int do_step_cloth( cloth = clmd->clothObject; verts = cloth->verts; - mvert = BKE_mesh_vertices_for_write(result); + mvert = BKE_mesh_verts_for_write(result); vert_mass_changed = verts->mass != clmd->sim_parms->mass; /* force any pinned verts to their constrained location. */ @@ -754,7 +754,7 @@ static bool cloth_from_object( shapekey_rest = CustomData_get_layer(&mesh->vdata, CD_CLOTH_ORCO); } - MVert *mvert = BKE_mesh_vertices_for_write(mesh); + MVert *mvert = BKE_mesh_verts_for_write(mesh); verts = clmd->clothObject->verts; @@ -1149,7 +1149,7 @@ static void cloth_update_springs(ClothModifierData *clmd) static void cloth_update_verts(Object *ob, ClothModifierData *clmd, Mesh *mesh) { unsigned int i = 0; - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); ClothVertex *verts = clmd->clothObject->verts; /* vertex count is already ensured to match */ @@ -1164,7 +1164,7 @@ static Mesh *cloth_make_rest_mesh(ClothModifierData *clmd, Mesh *mesh) { Mesh *new_mesh = BKE_mesh_copy_for_eval(mesh, false); ClothVertex *verts = clmd->clothObject->verts; - MVert *mvert = BKE_mesh_vertices_for_write(mesh); + MVert *mvert = BKE_mesh_verts_for_write(mesh); /* vertex count is already ensured to match */ for (unsigned i = 0; i < mesh->totvert; i++, verts++) { @@ -1459,7 +1459,7 @@ static bool cloth_build_springs(ClothModifierData *clmd, Mesh *mesh) unsigned int numpolys = (unsigned int)mesh->totpoly; float shrink_factor; const MEdge *medge = BKE_mesh_edges(mesh); - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); int index2 = 0; /* our second vertex index */ LinkNodePair *edgelist = NULL; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index bc59cd7fe05..bcc3db48947 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -548,7 +548,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[ else if (me_eval) { const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(me_eval); const MDeformVert *dvert = CustomData_get_layer(&me_eval->vdata, CD_MDEFORMVERT); - const MVert *verts = BKE_mesh_vertices(me_eval); + const MVert *verts = BKE_mesh_verts(me_eval); int numVerts = me_eval->totvert; /* check that dvert is a valid pointers (just in case) */ diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index 17fb9fdb03e..7f1179d0804 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -187,8 +187,8 @@ void BKE_crazyspace_set_quats_mesh(Mesh *me, BLI_bitmap *vert_tag = BLI_BITMAP_NEW(me->totvert, __func__); /* first store two sets of tangent vectors in vertices, we derive it just from the face-edges */ - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); for (int i = 0; i < me->totpoly; i++) { diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc index 47cd8495b18..8be7cec1b04 100644 --- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc +++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc @@ -640,9 +640,9 @@ Mesh *curve_to_mesh_sweep(const CurvesGeometry &main, offsets.vert.last(), offsets.edge.last(), 0, offsets.loop.last(), offsets.poly.last()); mesh->flag |= ME_AUTOSMOOTH; mesh->smoothresh = DEG2RADF(180.0f); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); foreach_curve_combination(curves_info, offsets, [&](const CombinationInfo &info) { diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 4c8b7a590ed..6fbdade08f8 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -257,11 +257,11 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src, if (dtdata_type == DT_TYPE_LNOR) { /* Compute custom normals into regular loop normals, which will be used for the transfer. */ - const MVert *verts_dst = BKE_mesh_vertices(me_dst); + const MVert *verts_dst = BKE_mesh_verts(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; - const MPoly *polys_dst = BKE_mesh_polygons(me_dst); + const MPoly *polys_dst = BKE_mesh_polys(me_dst); const int num_polys_dst = me_dst->totpoly; const MLoop *loops_dst = BKE_mesh_loops(me_dst); const int num_loops_dst = me_dst->totloop; @@ -319,11 +319,11 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src), } /* Bake edited destination loop normals into custom normals again. */ - const MVert *verts_dst = BKE_mesh_vertices(me_dst); + const MVert *verts_dst = BKE_mesh_verts(me_dst); const int num_verts_dst = me_dst->totvert; MEdge *edges_dst = BKE_mesh_edges_for_write(me_dst); const int num_edges_dst = me_dst->totedge; - MPoly *polys_dst = BKE_mesh_polygons_for_write(me_dst); + MPoly *polys_dst = BKE_mesh_polys_for_write(me_dst); const int num_polys_dst = me_dst->totpoly; MLoop *loops_dst = BKE_mesh_loops_for_write(me_dst); const int num_loops_dst = me_dst->totloop; @@ -947,8 +947,8 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map, mix_mode, mix_factor, mix_weights, - BKE_mesh_vertices(me_src), - BKE_mesh_vertices_for_write(me_dst), + BKE_mesh_verts(me_src), + BKE_mesh_verts_for_write(me_dst), me_src->totvert, me_dst->totvert, elem_size, @@ -1182,8 +1182,8 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map, mix_mode, mix_factor, mix_weights, - BKE_mesh_polygons(me_src), - BKE_mesh_polygons_for_write(me_dst), + BKE_mesh_polys(me_src), + BKE_mesh_polys_for_write(me_dst), me_src->totpoly, me_dst->totpoly, elem_size, @@ -1430,7 +1430,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } BKE_mesh_remap_find_best_match_from_mesh( - BKE_mesh_vertices(me_dst), me_dst->totvert, me_src, space_transform); + BKE_mesh_verts(me_dst), me_dst->totvert, me_src, space_transform); } /* Check all possible data types. @@ -1458,7 +1458,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } if (DT_DATATYPE_IS_VERT(dtdata_type)) { - MVert *verts_dst = BKE_mesh_vertices_for_write(me_dst); + MVert *verts_dst = BKE_mesh_verts_for_write(me_dst); const int num_verts_dst = me_dst->totvert; if (!geom_map_init[VDATA]) { @@ -1540,7 +1540,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_EDGE(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_vertices_for_write(me_dst); + const MVert *verts_dst = BKE_mesh_verts_for_write(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; @@ -1619,11 +1619,11 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_LOOP(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_vertices(me_dst); + const MVert *verts_dst = BKE_mesh_verts(me_dst); const int num_verts_dst = me_dst->totvert; const MEdge *edges_dst = BKE_mesh_edges(me_dst); const int num_edges_dst = me_dst->totedge; - const MPoly *polys_dst = BKE_mesh_polygons(me_dst); + const MPoly *polys_dst = BKE_mesh_polys(me_dst); const int num_polys_dst = me_dst->totpoly; const MLoop *loops_dst = BKE_mesh_loops(me_dst); const int num_loops_dst = me_dst->totloop; @@ -1714,9 +1714,9 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, } } if (DT_DATATYPE_IS_POLY(dtdata_type)) { - const MVert *verts_dst = BKE_mesh_vertices(me_dst); + const MVert *verts_dst = BKE_mesh_verts(me_dst); const int num_verts_dst = me_dst->totvert; - const MPoly *polys_dst = BKE_mesh_polygons(me_dst); + const MPoly *polys_dst = BKE_mesh_polys(me_dst); const int num_polys_dst = me_dst->totpoly; const MLoop *loops_dst = BKE_mesh_loops(me_dst); const int num_loops_dst = me_dst->totloop; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 9c09ebb6973..9d46c381d7a 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1403,7 +1403,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b int numOfEdges = mesh->totedge; int numOfPolys = mesh->totpoly; const MEdge *edges = BKE_mesh_edges(mesh); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); /* count number of edges per vertex */ @@ -1811,7 +1811,7 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Mesh /* displace paint */ if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) { - MVert *mvert = BKE_mesh_vertices_for_write(result); + MVert *mvert = BKE_mesh_verts_for_write(result); DynamicPaintModifierApplyData data = { .surface = surface, @@ -1915,7 +1915,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) { const MLoop *mloop = BKE_mesh_loops(result); const int totloop = result->totloop; - const MPoly *mpoly = BKE_mesh_polygons(result); + const MPoly *mpoly = BKE_mesh_polys(result); const int totpoly = result->totpoly; /* paint is stored on dry and wet layers, so mix final color first */ @@ -2010,7 +2010,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * } /* wave simulation */ else if (surface->type == MOD_DPAINT_SURFACE_T_WAVE) { - MVert *mvert = BKE_mesh_vertices_for_write(result); + MVert *mvert = BKE_mesh_verts_for_write(result); DynamicPaintModifierApplyData data = { .surface = surface, @@ -2961,7 +2961,7 @@ int dynamicPaint_createUVSurface(Scene *scene, BKE_mesh_vert_looptri_map_create(&vert_to_looptri_map, &vert_to_looptri_map_mem, - BKE_mesh_vertices_for_write(mesh), + BKE_mesh_verts_for_write(mesh), mesh->totvert, mlooptri, tottri, @@ -3782,7 +3782,7 @@ static void dynamicPaint_brushMeshCalculateVelocity(Depsgraph *depsgraph, mesh_p = BKE_mesh_copy_for_eval(dynamicPaint_brush_mesh_get(brush), false); numOfVerts_p = mesh_p->totvert; - mvert_p = BKE_mesh_vertices_for_write(mesh_p); + mvert_p = BKE_mesh_verts_for_write(mesh_p); copy_m4_m4(prev_obmat, ob->obmat); /* current frame mesh */ @@ -3798,7 +3798,7 @@ static void dynamicPaint_brushMeshCalculateVelocity(Depsgraph *depsgraph, eModifierType_DynamicPaint); mesh_c = dynamicPaint_brush_mesh_get(brush); numOfVerts_c = mesh_c->totvert; - mvert_c = BKE_mesh_vertices_for_write(mesh_c); + mvert_c = BKE_mesh_verts_for_write(mesh_c); (*brushVel) = (struct Vec3f *)MEM_mallocN(numOfVerts_c * sizeof(Vec3f), "Dynamic Paint brush velocity"); @@ -4269,7 +4269,7 @@ static bool dynamicPaint_paintMesh(Depsgraph *depsgraph, VolumeGrid *grid = bData->grid; mesh = BKE_mesh_copy_for_eval(brush_mesh, false); - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh); mlooptri = BKE_mesh_runtime_looptri_ensure(mesh); mloop = BKE_mesh_loops(mesh); @@ -4758,7 +4758,7 @@ static bool dynamicPaint_paintSinglePoint( } const Mesh *brush_mesh = dynamicPaint_brush_mesh_get(brush); - const MVert *mvert = BKE_mesh_vertices(brush_mesh); + const MVert *mvert = BKE_mesh_verts(brush_mesh); /* * Loop through every surface point @@ -5861,7 +5861,7 @@ static bool dynamicPaint_surfaceHasMoved(DynamicPaintSurface *surface, Object *o PaintSurfaceData *sData = surface->data; PaintBakeData *bData = sData->bData; Mesh *mesh = dynamicPaint_canvas_mesh_get(surface->canvas); - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); int numOfVerts = mesh->totvert; @@ -6021,7 +6021,7 @@ static bool dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const bool do_accel_data = (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) != 0; int canvasNumOfVerts = mesh->totvert; - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); Vec3f *canvas_verts; if (bData) { diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f2fce3edb88..f6a2975bea8 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -700,7 +700,7 @@ bool get_effector_data(EffectorCache *eff, else if (eff->pd && eff->pd->shape == PFIELD_SHAPE_POINTS) { /* TODO: hair and points object support */ const Mesh *me_eval = BKE_object_get_evaluated_mesh(eff->ob); - const MVert *verts = BKE_mesh_vertices(me_eval); + const MVert *verts = BKE_mesh_verts(me_eval); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(me_eval); if (me_eval != NULL) { copy_v3_v3(efd->loc, verts[*efd->index].co); diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 24c61a792eb..a81274c9bd7 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -404,7 +404,7 @@ static void manta_set_domain_from_mesh(FluidDomainSettings *fds, float min[3] = {FLT_MAX, FLT_MAX, FLT_MAX}, max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX}; float size[3]; - MVert *verts = BKE_mesh_vertices_for_write(me); + MVert *verts = BKE_mesh_verts_for_write(me); float scale = 0.0; int res; @@ -1007,7 +1007,7 @@ static void obstacles_from_mesh(Object *coll_ob, int min[3], max[3], res[3]; /* Duplicate vertices to modify. */ - MVert *verts = MEM_dupallocN(BKE_mesh_vertices(me)); + MVert *verts = MEM_dupallocN(BKE_mesh_verts(me)); const MLoop *mloop = BKE_mesh_loops(me); looptri = BKE_mesh_runtime_looptri_ensure(me); @@ -2073,7 +2073,7 @@ static void emit_from_mesh( Mesh *me = BKE_mesh_copy_for_eval(ffs->mesh, true); /* Duplicate vertices to modify. */ - MVert *verts = MEM_dupallocN(BKE_mesh_vertices(me)); + MVert *verts = MEM_dupallocN(BKE_mesh_verts(me)); const MLoop *mloop = BKE_mesh_loops(me); const MLoopTri *mlooptri = BKE_mesh_runtime_looptri_ensure(me); @@ -3228,7 +3228,7 @@ static Mesh *create_liquid_geometry(FluidDomainSettings *fds, * If there are no faces in original mesh, keep materials and flags unchanged. */ MPoly *mpoly; MPoly mp_example = {0}; - mpoly = BKE_mesh_polygons_for_write(orgmesh); + mpoly = BKE_mesh_polys_for_write(orgmesh); if (mpoly) { mp_example = *mpoly; } @@ -3260,8 +3260,8 @@ static Mesh *create_liquid_geometry(FluidDomainSettings *fds, if (!me) { return NULL; } - mverts = BKE_mesh_vertices_for_write(me); - mpolys = BKE_mesh_polygons_for_write(me); + mverts = BKE_mesh_verts_for_write(me); + mpolys = BKE_mesh_polys_for_write(me); mloops = BKE_mesh_loops_for_write(me); /* Get size (dimension) but considering scaling. */ @@ -3396,8 +3396,8 @@ static Mesh *create_smoke_geometry(FluidDomainSettings *fds, Mesh *orgmesh, Obje } result = BKE_mesh_new_nomain(num_verts, 0, 0, num_faces * 4, num_faces); - mverts = BKE_mesh_vertices_for_write(result); - mpolys = BKE_mesh_polygons_for_write(result); + mverts = BKE_mesh_verts_for_write(result); + mpolys = BKE_mesh_polys_for_write(result); mloops = BKE_mesh_loops_for_write(result); if (num_verts) { diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index d0bfc5f5499..1a994266df7 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -255,7 +255,7 @@ static GVArray adapt_mesh_domain_point_to_corner(const Mesh &mesh, const GVArray static GVArray adapt_mesh_domain_corner_to_face(const Mesh &mesh, const GVArray &varray) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); GVArray new_varray; attribute_math::convert_to_static_type(varray.type(), [&](auto dummy) { @@ -299,7 +299,7 @@ static void adapt_mesh_domain_corner_to_edge_impl(const Mesh &mesh, MutableSpan<T> r_values) { BLI_assert(r_values.size() == mesh.totedge); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); attribute_math::DefaultMixer<T> mixer(r_values); @@ -329,7 +329,7 @@ void adapt_mesh_domain_corner_to_edge_impl(const Mesh &mesh, MutableSpan<bool> r_values) { BLI_assert(r_values.size() == mesh.totedge); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); /* It may be possible to rely on the #ME_LOOSEEDGE flag, but that seems error-prone. */ @@ -384,7 +384,7 @@ void adapt_mesh_domain_face_to_point_impl(const Mesh &mesh, MutableSpan<T> r_values) { BLI_assert(r_values.size() == mesh.totvert); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); attribute_math::DefaultMixer<T> mixer(r_values); @@ -409,7 +409,7 @@ void adapt_mesh_domain_face_to_point_impl(const Mesh &mesh, MutableSpan<bool> r_values) { BLI_assert(r_values.size() == mesh.totvert); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_values.fill(false); @@ -446,7 +446,7 @@ void adapt_mesh_domain_face_to_corner_impl(const Mesh &mesh, MutableSpan<T> r_values) { BLI_assert(r_values.size() == mesh.totloop); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); threading::parallel_for(polys.index_range(), 1024, [&](const IndexRange range) { for (const int poly_index : range) { @@ -477,7 +477,7 @@ void adapt_mesh_domain_face_to_edge_impl(const Mesh &mesh, MutableSpan<T> r_values) { BLI_assert(r_values.size() == mesh.totedge); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); attribute_math::DefaultMixer<T> mixer(r_values); @@ -500,7 +500,7 @@ void adapt_mesh_domain_face_to_edge_impl(const Mesh &mesh, MutableSpan<bool> r_values) { BLI_assert(r_values.size() == mesh.totedge); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_values.fill(false); @@ -532,7 +532,7 @@ static GVArray adapt_mesh_domain_face_to_edge(const Mesh &mesh, const GVArray &v static GVArray adapt_mesh_domain_point_to_face(const Mesh &mesh, const GVArray &varray) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); GVArray new_varray; @@ -612,7 +612,7 @@ void adapt_mesh_domain_edge_to_corner_impl(const Mesh &mesh, MutableSpan<T> r_values) { BLI_assert(r_values.size() == mesh.totloop); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); attribute_math::DefaultMixer<T> mixer(r_values); @@ -640,7 +640,7 @@ void adapt_mesh_domain_edge_to_corner_impl(const Mesh &mesh, MutableSpan<bool> r_values) { BLI_assert(r_values.size() == mesh.totloop); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_values.fill(false); @@ -727,7 +727,7 @@ static GVArray adapt_mesh_domain_edge_to_point(const Mesh &mesh, const GVArray & static GVArray adapt_mesh_domain_edge_to_face(const Mesh &mesh, const GVArray &varray) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); GVArray new_varray; diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc index 4867da186f7..02f0a8398b0 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.cc +++ b/source/blender/blenkernel/intern/gpencil_geom.cc @@ -2464,7 +2464,7 @@ static void gpencil_generate_edgeloops(Object *ob, if (me->totedge == 0) { return; } - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const Span<MEdge> edges = me->edges(); const Span<MDeformVert> dverts = me->deform_verts(); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(me); @@ -2676,8 +2676,8 @@ bool BKE_gpencil_convert_mesh(Main *bmain, /* Use evaluated data to get mesh with all modifiers on top. */ Object *ob_eval = (Object *)DEG_get_evaluated_object(depsgraph, ob_mesh); const Mesh *me_eval = BKE_object_get_evaluated_mesh(ob_eval); - const Span<MVert> verts = me_eval->vertices(); - const Span<MPoly> polys = me_eval->polygons(); + const Span<MVert> verts = me_eval->verts(); + const Span<MPoly> polys = me_eval->polys(); const Span<MLoop> loops = me_eval->loops(); int mpoly_len = me_eval->totpoly; char element_name[200]; diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 97269a235c3..8e7690d41d6 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1607,7 +1607,7 @@ float *BKE_key_evaluate_object_ex( switch (GS(obdata->name)) { case ID_ME: { Mesh *mesh = (Mesh *)obdata; - MVert *verts = BKE_mesh_vertices_for_write(mesh); + MVert *verts = BKE_mesh_verts_for_write(mesh); const int totvert = min_ii(tot, mesh->totvert); keyblock_data_convert_to_mesh((const float(*)[3])out, verts, totvert); break; @@ -2184,7 +2184,7 @@ void BKE_keyblock_update_from_mesh(const Mesh *me, KeyBlock *kb) return; } - const MVert *mvert = BKE_mesh_vertices(me); + const MVert *mvert = BKE_mesh_verts(me); fp = kb->data; for (a = 0; a < tot; a++, fp++, mvert++) { copy_v3_v3(*fp, mvert->co); @@ -2232,10 +2232,10 @@ void BKE_keyblock_mesh_calc_normals(const KeyBlock *kb, return; } - MVert *verts = MEM_dupallocN(BKE_mesh_vertices(mesh)); + MVert *verts = MEM_dupallocN(BKE_mesh_verts(mesh)); BKE_keyblock_convert_to_mesh(kb, verts, mesh->totvert); const MEdge *edges = BKE_mesh_edges(mesh); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); const bool loop_normals_needed = r_loopnors != NULL; diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index c0379c50de4..361eb9bcbbe 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -255,9 +255,9 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address names_to_skip.add_multiple_new({".hide_vert", ".hide_edge", ".hide_poly"}); /* Set deprecated mesh data pointers for forward compatibility. */ - mesh->mvert = const_cast<MVert *>(mesh->vertices().data()); + mesh->mvert = const_cast<MVert *>(mesh->verts().data()); mesh->medge = const_cast<MEdge *>(mesh->edges().data()); - mesh->mpoly = const_cast<MPoly *>(mesh->polygons().data()); + mesh->mpoly = const_cast<MPoly *>(mesh->polys().data()); mesh->mloop = const_cast<MLoop *>(mesh->loops().data()); } @@ -1255,7 +1255,7 @@ float (*BKE_mesh_orco_verts_get(Object *ob))[3] /* Get appropriate vertex coordinates */ float(*vcos)[3] = (float(*)[3])MEM_calloc_arrayN(me->totvert, sizeof(*vcos), "orco mesh"); - const Span<MVert> verts = tme->vertices(); + const Span<MVert> verts = tme->verts(); int totvert = min_ii(tme->totvert, me->totvert); @@ -1430,7 +1430,7 @@ void BKE_mesh_material_remap(Mesh *me, const uint *remap, uint remap_len) void BKE_mesh_smooth_flag_set(Mesh *me, const bool use_smooth) { - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); if (use_smooth) { for (MPoly &poly : polys) { poly.flag |= ME_SMOOTH; @@ -1518,7 +1518,7 @@ bool BKE_mesh_minmax(const Mesh *me, float r_min[3], float r_max[3]) float3 min; float3 max; }; - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const Result minmax = threading::parallel_reduce( verts.index_range(), @@ -1543,7 +1543,7 @@ bool BKE_mesh_minmax(const Mesh *me, float r_min[3], float r_max[3]) void BKE_mesh_transform(Mesh *me, const float mat[4][4], bool do_keys) { - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); for (MVert &vert : verts) { mul_m4_v3(mat, vert.co); @@ -1577,7 +1577,7 @@ void BKE_mesh_transform(Mesh *me, const float mat[4][4], bool do_keys) void BKE_mesh_translate(Mesh *me, const float offset[3], const bool do_keys) { - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); for (MVert &vert : verts) { add_v3_v3(vert.co, offset); } @@ -1605,7 +1605,7 @@ void BKE_mesh_do_versions_cd_flag_init(Mesh *mesh) return; } - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); const Span<MEdge> edges = mesh->edges(); for (const MVert &vert : verts) { @@ -1648,9 +1648,9 @@ void BKE_mesh_mselect_validate(Mesh *me) if (me->totselect == 0) { return; } - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const Span<MEdge> edges = me->edges(); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); mselect_src = me->mselect; mselect_dst = (MSelect *)MEM_malloc_arrayN( @@ -1778,7 +1778,7 @@ float (*BKE_mesh_vert_coords_alloc(const Mesh *mesh, int *r_vert_len))[3] void BKE_mesh_vert_coords_apply(Mesh *mesh, const float (*vert_coords)[3]) { - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); for (const int i : verts.index_range()) { copy_v3_v3(verts[i].co, vert_coords[i]); } @@ -1789,7 +1789,7 @@ void BKE_mesh_vert_coords_apply_with_mat4(Mesh *mesh, const float (*vert_coords)[3], const float mat[4][4]) { - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); for (const int i : verts.index_range()) { mul_v3_m4v3(verts[i].co, mat, vert_coords[i]); } @@ -1827,9 +1827,9 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh, /* may be nullptr */ clnors = (short(*)[2])CustomData_get_layer(&mesh->ldata, CD_CUSTOMLOOPNORMAL); - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); const Span<MEdge> edges = mesh->edges(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); BKE_mesh_normals_loop_split(verts.data(), @@ -1965,7 +1965,7 @@ static int split_faces_prepare_new_edges(Mesh *mesh, int num_edges = mesh->totedge; MutableSpan<MEdge> edges = mesh->edges_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); BLI_bitmap *edges_used = BLI_BITMAP_NEW(num_edges, __func__); EdgeHash *edges_hash = BLI_edgehash_new_ex(__func__, num_edges); diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc index d5671b53267..e37de1ae513 100644 --- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc +++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc @@ -162,7 +162,7 @@ const MPoly *MeshesToIMeshInfo::input_mpoly_for_orig_index(int orig_index, int orig_mesh_index = input_mesh_for_imesh_face(orig_index); BLI_assert(0 <= orig_mesh_index && orig_mesh_index < meshes.size()); const Mesh *me = meshes[orig_mesh_index]; - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); int index_in_mesh = orig_index - mesh_poly_offset[orig_mesh_index]; BLI_assert(0 <= index_in_mesh && index_in_mesh < me->totpoly); const MPoly *mp = &polys[index_in_mesh]; @@ -189,7 +189,7 @@ const MVert *MeshesToIMeshInfo::input_mvert_for_orig_index(int orig_index, int orig_mesh_index = input_mesh_for_imesh_vert(orig_index); BLI_assert(0 <= orig_mesh_index && orig_mesh_index < meshes.size()); const Mesh *me = meshes[orig_mesh_index]; - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); int index_in_mesh = orig_index - mesh_vert_offset[orig_mesh_index]; BLI_assert(0 <= index_in_mesh && index_in_mesh < me->totvert); const MVert *mv = &verts[index_in_mesh]; @@ -309,8 +309,8 @@ static IMesh meshes_to_imesh(Span<const Mesh *> meshes, bool need_face_flip = r_info->has_negative_transform[mi] != r_info->has_negative_transform[0]; Vector<Vert *> verts(me->totvert); - const Span<MVert> mesh_verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> mesh_verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); /* Allocate verts @@ -563,7 +563,7 @@ static void get_poly2d_cos(const Mesh *me, const float4x4 &trans_mat, float r_axis_mat[3][3]) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const Span<MLoop> loops = me->loops(); const Span<MLoop> poly_loops = loops.slice(mp->loopstart, mp->totloop); @@ -609,7 +609,7 @@ static void copy_or_interp_loop_attributes(Mesh *dest_mesh, get_poly2d_cos(orig_me, orig_mp, cos_2d, mim.to_target_transform[orig_me_index], axis_mat); } CustomData *target_cd = &dest_mesh->ldata; - const Span<MVert> dst_vertices = dest_mesh->vertices(); + const Span<MVert> dst_vertices = dest_mesh->verts(); const Span<MLoop> dst_loops = dest_mesh->loops(); for (int i = 0; i < mp->totloop; ++i) { int loop_index = mp->loopstart + i; @@ -723,7 +723,7 @@ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim) merge_vertex_loop_poly_customdata_layers(result, mim); /* Set the vertex coordinate values and other data. */ - MutableSpan<MVert> vertices = result->vertices_for_write(); + MutableSpan<MVert> vertices = result->verts_for_write(); for (int vi : im->vert_index_range()) { const Vert *v = im->vert(vi); MVert *mv = &vertices[vi]; @@ -743,7 +743,7 @@ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim) "material_index", ATTR_DOMAIN_FACE); int cur_loop_index = 0; MutableSpan<MLoop> dst_loops = result->loops_for_write(); - MutableSpan<MPoly> dst_polys = result->polygons_for_write(); + MutableSpan<MPoly> dst_polys = result->polys_for_write(); MLoop *l = dst_loops.data(); for (int fi : im->face_index_range()) { const Face *f = im->face(fi); @@ -857,7 +857,7 @@ Mesh *direct_mesh_boolean(Span<const Mesh *> meshes, /* Store intersecting edge indices. */ if (r_intersecting_edges != nullptr) { - const Span<MPoly> polys = result->polygons(); + const Span<MPoly> polys = result->polys(); const Span<MLoop> loops = result->loops(); for (int fi : m_out.face_index_range()) { const Face &face = *m_out.face(fi); diff --git a/source/blender/blenkernel/intern/mesh_calc_edges.cc b/source/blender/blenkernel/intern/mesh_calc_edges.cc index 8a8960fb8a7..cc315130ad1 100644 --- a/source/blender/blenkernel/intern/mesh_calc_edges.cc +++ b/source/blender/blenkernel/intern/mesh_calc_edges.cc @@ -97,7 +97,7 @@ static void add_polygon_edges_to_hash_maps(Mesh *mesh, MutableSpan<EdgeMap> edge_maps, uint32_t parallel_mask) { - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); threading::parallel_for_each(edge_maps, [&](EdgeMap &edge_map) { const int task_index = &edge_map - edge_maps.data(); @@ -159,7 +159,7 @@ static void update_edge_indices_in_poly_loops(Mesh *mesh, Span<EdgeMap> edge_maps, uint32_t parallel_mask) { - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); MutableSpan<MLoop> loops = mesh->loops_for_write(); threading::parallel_for(IndexRange(mesh->totpoly), 100, [&](IndexRange range) { for (const int poly_index : range) { diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index e56c248e81a..9f8326454d2 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -81,7 +81,7 @@ static void make_edges_mdata_extend(Mesh &mesh) const MPoly *mp; int i; - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); MutableSpan<MLoop> loops = mesh.loops_for_write(); const int eh_reserve = max_ii(totedge, BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(mesh.totpoly)); @@ -184,9 +184,9 @@ static Mesh *mesh_nurbs_displist_to_mesh(const Curve *cu, const ListBase *dispba } Mesh *mesh = BKE_mesh_new_nomain(totvert, totedge, 0, totloop, totpoly); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); MVert *mvert = verts.data(); @@ -456,9 +456,9 @@ static void appendPolyLineVert(ListBase *lb, uint index) void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int edge_users_test) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const Span<MEdge> mesh_edges = me->edges(); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); const MEdge *med; @@ -690,7 +690,7 @@ void BKE_mesh_from_pointcloud(const PointCloud *pointcloud, Mesh *me) CustomDataLayer *pos_layer = &me->vdata.layers[layer_idx]; float(*positions)[3] = (float(*)[3])pos_layer->data; - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); for (int i = 0; i < me->totvert; i++) { copy_v3_v3(verts[i].co, positions[i]); } @@ -1169,7 +1169,7 @@ Mesh *BKE_mesh_create_derived_for_modifier(struct Depsgraph *depsgraph, if (build_shapekey_layers && me->key && (kb = (KeyBlock *)BLI_findlink(&me->key->block, ob_eval->shapenr - 1))) { - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); BKE_keyblock_convert_to_mesh(kb, verts.data(), me->totvert); } @@ -1273,7 +1273,7 @@ static void shapekey_layers_to_keyblocks(Mesh *mesh_src, Mesh *mesh_dst, int act kb->data = kbcos = (float(*)[3])MEM_malloc_arrayN(kb->totelem, sizeof(float[3]), __func__); if (kb->uid == actshape_uid) { - const Span<MVert> verts = mesh_src->vertices(); + const Span<MVert> verts = mesh_src->verts(); for (j = 0; j < mesh_src->totvert; j++, kbcos++) { copy_v3_v3(*kbcos, verts[j].co); } @@ -1384,8 +1384,8 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, CustomData_add_layer(&tmp.vdata, CD_MVERT, CD_ASSIGN, - (alloctype == CD_ASSIGN) ? mesh_src->vertices_for_write().data() : - MEM_dupallocN(mesh_src->vertices().data()), + (alloctype == CD_ASSIGN) ? mesh_src->verts_for_write().data() : + MEM_dupallocN(mesh_src->verts().data()), totvert); } if (!CustomData_has_layer(&tmp.edata, CD_MEDGE)) { @@ -1406,8 +1406,8 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, CustomData_add_layer(&tmp.pdata, CD_MPOLY, CD_ASSIGN, - (alloctype == CD_ASSIGN) ? mesh_src->polygons_for_write().data() : - MEM_dupallocN(mesh_src->polygons().data()), + (alloctype == CD_ASSIGN) ? mesh_src->polys_for_write().data() : + MEM_dupallocN(mesh_src->polys().data()), tmp.totpoly); } @@ -1489,7 +1489,7 @@ void BKE_mesh_nomain_to_meshkey(Mesh *mesh_src, Mesh *mesh_dst, KeyBlock *kb) kb->totelem = totvert; fp = (float *)kb->data; - const Span<MVert> verts = mesh_src->vertices(); + const Span<MVert> verts = mesh_src->verts(); for (a = 0; a < kb->totelem; a++, fp += 3) { copy_v3_v3(fp, verts[a].co); } diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc index 7e52b96cc92..f2fe2e0b141 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.cc +++ b/source/blender/blenkernel/intern/mesh_evaluate.cc @@ -205,8 +205,8 @@ float BKE_mesh_calc_poly_area(const MPoly *mpoly, const MLoop *loopstart, const float BKE_mesh_calc_area(const Mesh *me) { - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); float total_area = 0.0f; @@ -400,7 +400,7 @@ void BKE_mesh_poly_edgebitmap_insert(uint *edge_bitmap, const MPoly *mp, const M bool BKE_mesh_center_median(const Mesh *me, float r_cent[3]) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); zero_v3(r_cent); for (const MVert &vert : verts) { add_v3_v3(r_cent, vert.co); @@ -415,8 +415,8 @@ bool BKE_mesh_center_median(const Mesh *me, float r_cent[3]) bool BKE_mesh_center_median_from_polys(const Mesh *me, float r_cent[3]) { int tot = 0; - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); zero_v3(r_cent); for (const MPoly &poly : polys) { @@ -452,8 +452,8 @@ bool BKE_mesh_center_of_surface(const Mesh *me, float r_cent[3]) float poly_area; float total_area = 0.0f; float poly_cent[3]; - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); zero_v3(r_cent); @@ -485,8 +485,8 @@ bool BKE_mesh_center_of_volume(const Mesh *me, float r_cent[3]) float poly_volume; float total_volume = 0.0f; float poly_cent[3]; - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); /* Use an initial center to avoid numeric instability of geometry far away from the center. */ @@ -747,7 +747,7 @@ void BKE_mesh_flush_hidden_from_verts(Mesh *me) } const VArraySpan<bool> hide_vert_span{hide_vert}; const Span<MEdge> edges = me->edges(); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); /* Hide edges when either of their vertices are hidden. */ @@ -786,7 +786,7 @@ void BKE_mesh_flush_hidden_from_polys(Mesh *me) return; } const VArraySpan<bool> hide_poly_span{hide_poly}; - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); SpanAttributeWriter<bool> hide_vert = attributes.lookup_or_add_for_write_only_span<bool>( ".hide_vert", ATTR_DOMAIN_POINT); @@ -857,12 +857,12 @@ void BKE_mesh_flush_select_from_polys_ex(MVert *mvert, } void BKE_mesh_flush_select_from_polys(Mesh *me) { - BKE_mesh_flush_select_from_polys_ex(me->vertices_for_write().data(), + BKE_mesh_flush_select_from_polys_ex(me->verts_for_write().data(), me->totvert, me->loops().data(), me->edges_for_write().data(), me->totedge, - me->polygons().data(), + me->polys().data(), me->totpoly); } @@ -909,12 +909,12 @@ void BKE_mesh_flush_select_from_verts(Mesh *me) { const blender::bke::AttributeAccessor attributes = blender::bke::mesh_attributes(*me); mesh_flush_select_from_verts( - me->vertices(), + me->verts(), me->loops(), attributes.lookup_or_default<bool>(".hide_edge", ATTR_DOMAIN_EDGE, false), attributes.lookup_or_default<bool>(".hide_poly", ATTR_DOMAIN_FACE, false), me->edges_for_write(), - me->polygons_for_write()); + me->polys_for_write()); } /** \} */ diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 0fe58366449..fe5add864ea 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -195,9 +195,9 @@ class MeshFairingContext : public FairingContext { totvert_ = mesh->totvert; totloop_ = mesh->totloop; - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); medge_ = mesh->edges(); - mpoly_ = mesh->polygons(); + mpoly_ = mesh->polys(); mloop_ = mesh->loops(); BKE_mesh_vert_loop_map_create(&vlmap_, &vlmap_mem_, diff --git a/source/blender/blenkernel/intern/mesh_iterators.c b/source/blender/blenkernel/intern/mesh_iterators.c index 352ad8e9042..d3a7f6cc72f 100644 --- a/source/blender/blenkernel/intern/mesh_iterators.c +++ b/source/blender/blenkernel/intern/mesh_iterators.c @@ -65,7 +65,7 @@ void BKE_mesh_foreach_mapped_vert( } } else { - const MVert *mv = BKE_mesh_vertices(mesh); + const MVert *mv = BKE_mesh_verts(mesh); const int *index = CustomData_get_layer(&mesh->vdata, CD_ORIGINDEX); const float(*vert_normals)[3] = (flag & MESH_FOREACH_USE_NORMAL) ? BKE_mesh_vertex_normals_ensure(mesh) : @@ -120,7 +120,7 @@ void BKE_mesh_foreach_mapped_edge( } } else { - const MVert *mv = BKE_mesh_vertices(mesh); + const MVert *mv = BKE_mesh_verts(mesh); const MEdge *med = BKE_mesh_edges(mesh); const int *index = CustomData_get_layer(&mesh->edata, CD_ORIGINDEX); @@ -188,9 +188,9 @@ void BKE_mesh_foreach_mapped_loop(Mesh *mesh, CustomData_get_layer(&mesh->ldata, CD_NORMAL) : NULL; - const MVert *mv = BKE_mesh_vertices(mesh); + const MVert *mv = BKE_mesh_verts(mesh); const MLoop *ml = BKE_mesh_loops(mesh); - const MPoly *mp = BKE_mesh_polygons(mesh); + const MPoly *mp = BKE_mesh_polys(mesh); const int *v_index = CustomData_get_layer(&mesh->vdata, CD_ORIGINDEX); const int *f_index = CustomData_get_layer(&mesh->pdata, CD_ORIGINDEX); int p_idx, i; @@ -261,8 +261,8 @@ void BKE_mesh_foreach_mapped_face_center( } } else { - const MVert *mvert = BKE_mesh_vertices(mesh); - const MPoly *mp = BKE_mesh_polygons(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); + const MPoly *mp = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); const MLoop *ml; float _no_buf[3]; @@ -304,8 +304,8 @@ void BKE_mesh_foreach_mapped_subdiv_face_center( void *userData, MeshForeachFlag flag) { - const MVert *verts = BKE_mesh_vertices(mesh); - const MPoly *mp = BKE_mesh_polygons(mesh); + const MVert *verts = BKE_mesh_verts(mesh); + const MPoly *mp = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); const MLoop *ml; const MVert *mv; diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index c2a4b0176c6..39b1ffb7cf4 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -824,7 +824,7 @@ void BKE_mesh_tessface_calc(Mesh *mesh) mesh->totface = mesh_tessface_calc(&mesh->fdata, &mesh->ldata, &mesh->pdata, - BKE_mesh_vertices_for_write(mesh), + BKE_mesh_verts_for_write(mesh), mesh->totface, mesh->totloop, mesh->totpoly); @@ -927,7 +927,7 @@ void BKE_mesh_legacy_convert_hide_layers_to_flags(Mesh *mesh) using namespace blender::bke; const AttributeAccessor attributes = mesh_attributes(*mesh); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); const VArray<bool> hide_vert = attributes.lookup_or_default<bool>( ".hide_vert", ATTR_DOMAIN_POINT, false); threading::parallel_for(verts.index_range(), 4096, [&](IndexRange range) { @@ -945,7 +945,7 @@ void BKE_mesh_legacy_convert_hide_layers_to_flags(Mesh *mesh) } }); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); const VArray<bool> hide_poly = attributes.lookup_or_default<bool>( ".hide_poly", ATTR_DOMAIN_FACE, false); threading::parallel_for(polys.index_range(), 4096, [&](IndexRange range) { @@ -961,7 +961,7 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh) using namespace blender::bke; MutableAttributeAccessor attributes = mesh_attributes_for_write(*mesh); - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); if (std::any_of( verts.begin(), verts.end(), [](const MVert &vert) { return vert.flag & ME_HIDE; })) { SpanAttributeWriter<bool> hide_vert = attributes.lookup_or_add_for_write_only_span<bool>( @@ -987,7 +987,7 @@ void BKE_mesh_legacy_convert_flags_to_hide_layers(Mesh *mesh) hide_edge.finish(); } - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); if (std::any_of( polys.begin(), polys.end(), [](const MPoly &poly) { return poly.flag & ME_HIDE; })) { SpanAttributeWriter<bool> hide_poly = attributes.lookup_or_add_for_write_only_span<bool>( @@ -1011,7 +1011,7 @@ void BKE_mesh_legacy_convert_material_indices_to_mpoly(Mesh *mesh) using namespace blender; using namespace blender::bke; const AttributeAccessor attributes = mesh_attributes(*mesh); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); const VArray<int> material_indices = attributes.lookup_or_default<int>( "material_index", ATTR_DOMAIN_FACE, 0); threading::parallel_for(polys.index_range(), 4096, [&](IndexRange range) { @@ -1026,7 +1026,7 @@ void BKE_mesh_legacy_convert_mpoly_to_material_indices(Mesh *mesh) using namespace blender; using namespace blender::bke; MutableAttributeAccessor attributes = mesh_attributes_for_write(*mesh); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); if (std::any_of( polys.begin(), polys.end(), [](const MPoly &poly) { return poly.mat_nr != 0; })) { SpanAttributeWriter<int> material_indices = attributes.lookup_or_add_for_write_only_span<int>( diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index 18fbaaccb92..dc1ebf4c6e0 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -203,9 +203,9 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int totedge = mesh->totedge; const int totloop = mesh->totloop; const int totpoly = mesh->totpoly; - const MVert *src_verts = BKE_mesh_vertices(mesh); + const MVert *src_verts = BKE_mesh_verts(mesh); const MEdge *src_edges = BKE_mesh_edges(mesh); - const MPoly *src_polys = BKE_mesh_polygons(mesh); + const MPoly *src_polys = BKE_mesh_polys(mesh); const MLoop *src_loops = BKE_mesh_loops(mesh); const int totvert_final = totvert - tot_vtargetmap; @@ -611,7 +611,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, /* Copy over data. #CustomData_add_layer can do this, need to look it up. */ if (STACK_SIZE(mvert)) { - memcpy(BKE_mesh_vertices_for_write(result), mvert, sizeof(MVert) * STACK_SIZE(mvert)); + memcpy(BKE_mesh_verts_for_write(result), mvert, sizeof(MVert) * STACK_SIZE(mvert)); } if (STACK_SIZE(medge)) { memcpy(BKE_mesh_edges_for_write(result), medge, sizeof(MEdge) * STACK_SIZE(medge)); @@ -620,7 +620,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, memcpy(BKE_mesh_loops_for_write(result), mloop, sizeof(MLoop) * STACK_SIZE(mloop)); } if (STACK_SIZE(mpoly)) { - memcpy(BKE_mesh_polygons_for_write(result), mpoly, sizeof(MPoly) * STACK_SIZE(mpoly)); + memcpy(BKE_mesh_polys_for_write(result), mpoly, sizeof(MPoly) * STACK_SIZE(mpoly)); } MEM_freeN(mvert); diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index b253d3f9c46..f7936d8a4da 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc @@ -115,7 +115,7 @@ void BKE_mesh_merge_customdata_for_apply_modifier(Mesh *me) struct MeshElemMap *vert_to_loop; BKE_mesh_vert_loop_map_create(&vert_to_loop, &vert_map_mem, - BKE_mesh_polygons(me), + BKE_mesh_polys(me), BKE_mesh_loops(me), me->totvert, me->totpoly, diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index 534c8241820..2a64f6628f2 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -211,18 +211,14 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, /* Subsurf for eg won't have mesh data in the custom-data arrays. * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&mesh->vdata, CD_MVERT)) { - memcpy(BKE_mesh_vertices_for_write(result), - BKE_mesh_vertices(mesh), - sizeof(MVert) * mesh->totvert); + memcpy(BKE_mesh_verts_for_write(result), BKE_mesh_verts(mesh), sizeof(MVert) * mesh->totvert); } if (!CustomData_has_layer(&mesh->edata, CD_MEDGE)) { memcpy(BKE_mesh_edges_for_write(result), BKE_mesh_edges(mesh), sizeof(MEdge) * mesh->totedge); } if (!CustomData_has_layer(&mesh->pdata, CD_MPOLY)) { memcpy(BKE_mesh_loops_for_write(result), BKE_mesh_loops(mesh), sizeof(MLoop) * mesh->totloop); - memcpy(BKE_mesh_polygons_for_write(result), - BKE_mesh_polygons(mesh), - sizeof(MPoly) * mesh->totpoly); + memcpy(BKE_mesh_polys_for_write(result), BKE_mesh_polys(mesh), sizeof(MPoly) * mesh->totpoly); } /* Copy custom-data to new geometry, @@ -241,7 +237,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, } /* mirror vertex coordinates */ - mv_prev = BKE_mesh_vertices_for_write(result); + mv_prev = BKE_mesh_verts_for_write(result); mv = mv_prev + maxVerts; for (i = 0; i < maxVerts; i++, mv++, mv_prev++) { mul_m4_v3(mtx, mv->co); @@ -315,7 +311,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, } /* adjust mirrored poly loopstart indices, and reverse loop order (normals) */ - mp = BKE_mesh_polygons_for_write(result) + maxPolys; + mp = BKE_mesh_polys_for_write(result) + maxPolys; ml = BKE_mesh_loops_for_write(result); for (i = 0; i < maxPolys; i++, mp++) { MLoop *ml2; @@ -409,7 +405,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, /* calculate custom normals into loop_normals, then mirror first half into second half */ - BKE_mesh_normals_loop_split(BKE_mesh_vertices(result), + BKE_mesh_normals_loop_split(BKE_mesh_verts(result), BKE_mesh_vertex_normals_ensure(result), result->totvert, BKE_mesh_edges(result), @@ -417,7 +413,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, BKE_mesh_loops(result), loop_normals, totloop, - BKE_mesh_polygons(result), + BKE_mesh_polys(result), BKE_mesh_poly_normals_ensure(result), totpoly, true, @@ -427,7 +423,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd, NULL); /* mirroring has to account for loops being reversed in polys in second half */ - MPoly *result_polys = BKE_mesh_polygons_for_write(result); + MPoly *result_polys = BKE_mesh_polys_for_write(result); mp = result_polys; for (i = 0; i < maxPolys; i++, mp++) { MPoly *mpmirror = result_polys + maxPolys + i; diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 7217cbf5880..706026f072b 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -369,8 +369,8 @@ const float (*BKE_mesh_vertex_normals_ensure(const Mesh *mesh))[3] /* Isolate task because a mutex is locked and computing normals is multi-threaded. */ blender::threading::isolate_task([&]() { Mesh &mesh_mutable = *const_cast<Mesh *>(mesh); - const Span<MVert> verts = mesh_mutable.vertices(); - const Span<MPoly> polys = mesh_mutable.polygons(); + const Span<MVert> verts = mesh_mutable.verts(); + const Span<MPoly> polys = mesh_mutable.polys(); const Span<MLoop> loops = mesh_mutable.loops(); vert_normals = BKE_mesh_vertex_normals_for_write(&mesh_mutable); @@ -417,8 +417,8 @@ const float (*BKE_mesh_poly_normals_ensure(const Mesh *mesh))[3] /* Isolate task because a mutex is locked and computing normals is multi-threaded. */ blender::threading::isolate_task([&]() { Mesh &mesh_mutable = *const_cast<Mesh *>(mesh); - const Span<MVert> verts = mesh_mutable.vertices(); - const Span<MPoly> polys = mesh_mutable.polygons(); + const Span<MVert> verts = mesh_mutable.verts(); + const Span<MPoly> polys = mesh_mutable.polys(); const Span<MLoop> loops = mesh_mutable.loops(); poly_normals = BKE_mesh_poly_normals_for_write(&mesh_mutable); @@ -2063,9 +2063,9 @@ static void mesh_set_custom_normals(Mesh *mesh, float (*r_custom_nors)[3], const clnors = (short(*)[2])CustomData_add_layer( &mesh->ldata, CD_CUSTOMLOOPNORMAL, CD_SET_DEFAULT, nullptr, numloops); } - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); mesh_normals_loop_custom_set(verts.data(), diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index cdb8bc96dda..d63d064eb3c 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -573,7 +573,7 @@ void BKE_mesh_remap_calc_verts_from_mesh(const int mode, MREMAP_MODE_VERT_POLY_NEAREST, MREMAP_MODE_VERT_POLYINTERP_NEAREST, MREMAP_MODE_VERT_POLYINTERP_VNORPROJ)) { - const MPoly *polys_src = BKE_mesh_polygons(me_src); + const MPoly *polys_src = BKE_mesh_polys(me_src); const MLoop *loops_src = BKE_mesh_loops(me_src); float(*vcos_src)[3] = BKE_mesh_vert_coords_alloc(me_src, NULL); const float(*vert_normals_dst)[3] = BKE_mesh_vertex_normals_ensure(me_dst); @@ -874,7 +874,7 @@ void BKE_mesh_remap_calc_edges_from_mesh(const int mode, } else if (mode == MREMAP_MODE_EDGE_POLY_NEAREST) { const MEdge *edges_src = BKE_mesh_edges(me_src); - const MPoly *polys_src = BKE_mesh_polygons(me_src); + const MPoly *polys_src = BKE_mesh_polys(me_src); const MLoop *loops_src = BKE_mesh_loops(me_src); float(*vcos_src)[3] = BKE_mesh_vert_coords_alloc(me_src, NULL); @@ -1302,14 +1302,14 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode, /* Unlike above, those are one-to-one mappings, simpler! */ int *loop_to_poly_map_src = NULL; - const MVert *verts_src = BKE_mesh_vertices(me_src); + const MVert *verts_src = BKE_mesh_verts(me_src); const int num_verts_src = me_src->totvert; float(*vcos_src)[3] = NULL; const MEdge *edges_src = BKE_mesh_edges(me_src); const int num_edges_src = me_src->totedge; const MLoop *loops_src = BKE_mesh_loops(me_src); const int num_loops_src = me_src->totloop; - const MPoly *polys_src = BKE_mesh_polygons(me_src); + const MPoly *polys_src = BKE_mesh_polys(me_src); const int num_polys_src = me_src->totpoly; const MLoopTri *looptri_src = NULL; int num_looptri_src = 0; diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc index 1b583b6a851..eb14028f49a 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc +++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc @@ -61,7 +61,7 @@ static Mesh *remesh_quadriflow(const Mesh *input_mesh, void (*update_cb)(void *, float progress, int *cancel), void *update_cb_data) { - const Span<MVert> input_verts = input_mesh->vertices(); + const Span<MVert> input_verts = input_mesh->verts(); const Span<MLoop> input_loops = input_mesh->loops(); const MLoopTri *looptri = BKE_mesh_runtime_looptri_ensure(input_mesh); @@ -124,8 +124,8 @@ static Mesh *remesh_quadriflow(const Mesh *input_mesh, /* Construct the new output mesh */ Mesh *mesh = BKE_mesh_new_nomain(qrd.out_totverts, 0, 0, qrd.out_totfaces * 4, qrd.out_totfaces); - MutableSpan<MVert> mesh_verts = mesh->vertices_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MVert> mesh_verts = mesh->verts_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); for (const int i : IndexRange(qrd.out_totverts)) { @@ -190,7 +190,7 @@ Mesh *BKE_mesh_remesh_quadriflow(const Mesh *mesh, static openvdb::FloatGrid::Ptr remesh_voxel_level_set_create(const Mesh *mesh, const float voxel_size) { - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); const Span<MLoop> loops = mesh->loops(); Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(mesh), BKE_mesh_runtime_looptri_len(mesh)}; @@ -230,8 +230,8 @@ static Mesh *remesh_voxel_volume_to_mesh(const openvdb::FloatGrid::Ptr level_set Mesh *mesh = BKE_mesh_new_nomain( vertices.size(), 0, 0, quads.size() * 4 + tris.size() * 3, quads.size() + tris.size()); - MutableSpan<MVert> mesh_verts = mesh->vertices_for_write(); - MutableSpan<MPoly> mesh_polys = mesh->polygons_for_write(); + MutableSpan<MVert> mesh_verts = mesh->verts_for_write(); + MutableSpan<MPoly> mesh_polys = mesh->polys_for_write(); MutableSpan<MLoop> mesh_loops = mesh->loops_for_write(); for (const int i : mesh_verts.index_range()) { diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc index 6ce47edf730..a66f2a714e7 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.cc +++ b/source/blender/blenkernel/intern/mesh_runtime.cc @@ -150,8 +150,8 @@ void BKE_mesh_runtime_looptri_recalc(Mesh *mesh) { mesh_ensure_looptri_data(mesh); BLI_assert(mesh->totpoly == 0 || mesh->runtime.looptris.array_wip != nullptr); - const Span<MVert> verts = mesh->vertices(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MVert> verts = mesh->verts(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); BKE_mesh_recalc_looptri(loops.data(), @@ -330,9 +330,9 @@ bool BKE_mesh_runtime_is_valid(Mesh *me_eval) printf("MESH: %s\n", me_eval->id.name + 2); } - MutableSpan<MVert> verts = me_eval->vertices_for_write(); + MutableSpan<MVert> verts = me_eval->verts_for_write(); MutableSpan<MEdge> edges = me_eval->edges_for_write(); - MutableSpan<MPoly> polys = me_eval->polygons_for_write(); + MutableSpan<MPoly> polys = me_eval->polys_for_write(); MutableSpan<MLoop> loops = me_eval->loops_for_write(); is_valid &= BKE_mesh_validate_all_customdata( diff --git a/source/blender/blenkernel/intern/mesh_sample.cc b/source/blender/blenkernel/intern/mesh_sample.cc index f37246ced94..1ddac19304d 100644 --- a/source/blender/blenkernel/intern/mesh_sample.cc +++ b/source/blender/blenkernel/intern/mesh_sample.cc @@ -159,7 +159,7 @@ Span<float3> MeshAttributeInterpolator::ensure_barycentric_coords() } bary_coords_.reinitialize(mask_.min_array_size()); - const Span<MVert> verts = mesh_->vertices(); + const Span<MVert> verts = mesh_->verts(); const Span<MLoop> loops = mesh_->loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(mesh_), BKE_mesh_runtime_looptri_len(mesh_)}; @@ -189,7 +189,7 @@ Span<float3> MeshAttributeInterpolator::ensure_nearest_weights() } nearest_weights_.reinitialize(mask_.min_array_size()); - const Span<MVert> verts = mesh_->vertices(); + const Span<MVert> verts = mesh_->verts(); const Span<MLoop> loops = mesh_->loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(mesh_), BKE_mesh_runtime_looptri_len(mesh_)}; @@ -263,7 +263,7 @@ int sample_surface_points_spherical(RandomNumberGenerator &rng, Vector<int> &r_looptri_indices, Vector<float3> &r_positions) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MLoop> loops = mesh.loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(&mesh), BKE_mesh_runtime_looptri_len(&mesh)}; @@ -361,7 +361,7 @@ int sample_surface_points_projected( Vector<int> &r_looptri_indices, Vector<float3> &r_positions) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MLoop> loops = mesh.loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(&mesh), BKE_mesh_runtime_looptri_len(&mesh)}; diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index 003b196107f..3c1cdf84b3d 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/source/blender/blenkernel/intern/mesh_tangent.cc @@ -141,14 +141,14 @@ void BKE_mesh_calc_loop_tangent_single(Mesh *mesh, return; } - BKE_mesh_calc_loop_tangent_single_ex(BKE_mesh_vertices(mesh), + BKE_mesh_calc_loop_tangent_single_ex(BKE_mesh_verts(mesh), mesh->totvert, BKE_mesh_loops(mesh), r_looptangents, loopnors, loopuvs, mesh->totloop, - BKE_mesh_polygons(mesh), + BKE_mesh_polys(mesh), mesh->totpoly, reports); } @@ -581,8 +581,8 @@ void BKE_mesh_calc_loop_tangents(Mesh *me_eval, /* TODO(@campbellbarton): store in Mesh.runtime to avoid recalculation. */ short tangent_mask = 0; BKE_mesh_calc_loop_tangent_ex( - BKE_mesh_vertices(me_eval), - BKE_mesh_polygons(me_eval), + BKE_mesh_verts(me_eval), + BKE_mesh_polys(me_eval), (uint)me_eval->totpoly, BKE_mesh_loops(me_eval), me_eval->runtime.looptris.array, diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc index dafc2384282..50577969a83 100644 --- a/source/blender/blenkernel/intern/mesh_validate.cc +++ b/source/blender/blenkernel/intern/mesh_validate.cc @@ -1067,9 +1067,9 @@ bool BKE_mesh_validate(Mesh *me, const bool do_verbose, const bool cddata_check_ do_verbose, true, &changed); - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); MutableSpan<MEdge> edges = me->edges_for_write(); - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); MutableSpan<MLoop> loops = me->loops_for_write(); BKE_mesh_validate_arrays(me, @@ -1120,9 +1120,9 @@ bool BKE_mesh_is_valid(Mesh *me) do_fixes, &changed); - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); MutableSpan<MEdge> edges = me->edges_for_write(); - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); MutableSpan<MLoop> loops = me->loops_for_write(); is_valid &= BKE_mesh_validate_arrays(me, @@ -1201,7 +1201,7 @@ void BKE_mesh_strip_loose_faces(Mesh *me) void BKE_mesh_strip_loose_polysloops(Mesh *me) { - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); MutableSpan<MLoop> loops = me->loops_for_write(); MPoly *p; @@ -1497,8 +1497,8 @@ void BKE_mesh_calc_edges_legacy(Mesh *me, const bool use_old) { MEdge *medge; int totedge = 0; - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); MutableSpan<MLoop> loops = me->loops_for_write(); mesh_calc_edges_mdata(verts.data(), diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index fe28fc37d45..101fad2fce8 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -197,7 +197,7 @@ void BKE_mesh_wrapper_vert_coords_copy(const Mesh *me, case ME_WRAPPER_TYPE_MDATA: case ME_WRAPPER_TYPE_SUBD: { BLI_assert(vert_coords_len <= me->totvert); - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); for (int i = 0; i < vert_coords_len; i++) { copy_v3_v3(vert_coords[i], verts[i].co); } @@ -235,7 +235,7 @@ void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const Mesh *me, case ME_WRAPPER_TYPE_MDATA: case ME_WRAPPER_TYPE_SUBD: { BLI_assert(vert_coords_len == me->totvert); - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); for (int i = 0; i < vert_coords_len; i++) { mul_v3_m4v3(vert_coords[i], mat, verts[i].co); } diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 20b7ed7b4b2..7dc7e6009d9 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -183,7 +183,7 @@ static BLI_bitmap *multires_mdisps_downsample_hidden(const BLI_bitmap *old_hidde static void multires_output_hidden_to_ccgdm(CCGDerivedMesh *ccgdm, Mesh *me, int level) { - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); const MDisps *mdisps = CustomData_get_layer(&me->ldata, CD_MDISPS); BLI_bitmap **grid_hidden = ccgdm->gridHidden; int *gridOffset; @@ -467,7 +467,7 @@ void multires_force_external_reload(Object *object) static int get_levels_from_disps(Object *ob) { Mesh *me = ob->data; - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); MDisps *mdisp, *md; int i, j, totlvl = 0; @@ -635,7 +635,7 @@ static void multires_grid_paint_mask_downsample(GridPaintMask *gpm, int level) static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl) { Mesh *me = (Mesh *)ob->data; - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); int levels = mmd->totlvl - lvl; MDisps *mdisps; GridPaintMask *gpm; @@ -942,7 +942,7 @@ static void multiresModifier_disp_run( CCGDerivedMesh *ccgdm = (CCGDerivedMesh *)dm; CCGElem **gridData, **subGridData; CCGKey key; - const MPoly *mpoly = BKE_mesh_polygons(me); + const MPoly *mpoly = BKE_mesh_polys(me); MDisps *mdisps = CustomData_get_layer(&me->ldata, CD_MDISPS); GridPaintMask *grid_paint_mask = NULL; int *gridOffset; diff --git a/source/blender/blenkernel/intern/multires_reshape_apply_base.c b/source/blender/blenkernel/intern/multires_reshape_apply_base.c index 73f7197dcc9..81b0abbdcf5 100644 --- a/source/blender/blenkernel/intern/multires_reshape_apply_base.c +++ b/source/blender/blenkernel/intern/multires_reshape_apply_base.c @@ -30,7 +30,7 @@ void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *reshape_context) { Mesh *base_mesh = reshape_context->base_mesh; - MVert *base_verts = BKE_mesh_vertices_for_write(base_mesh); + MVert *base_verts = BKE_mesh_verts_for_write(base_mesh); /* Update the context in case the vertices were duplicated. */ reshape_context->base_verts = base_verts; @@ -69,7 +69,7 @@ static float v3_dist_from_plane(const float v[3], const float center[3], const f void multires_reshape_apply_base_refit_base_mesh(MultiresReshapeContext *reshape_context) { Mesh *base_mesh = reshape_context->base_mesh; - MVert *base_verts = BKE_mesh_vertices_for_write(base_mesh); + MVert *base_verts = BKE_mesh_verts_for_write(base_mesh); /* Update the context in case the vertices were duplicated. */ reshape_context->base_verts = base_verts; MeshElemMap *pmap; diff --git a/source/blender/blenkernel/intern/multires_reshape_subdivide.c b/source/blender/blenkernel/intern/multires_reshape_subdivide.c index 0a630a4343e..effea2467bc 100644 --- a/source/blender/blenkernel/intern/multires_reshape_subdivide.c +++ b/source/blender/blenkernel/intern/multires_reshape_subdivide.c @@ -28,8 +28,8 @@ static void multires_subdivide_create_object_space_linear_grids(Mesh *mesh) { - const MVert *verts = BKE_mesh_vertices(mesh); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MVert *verts = BKE_mesh_verts(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); MDisps *mdisps = CustomData_get_layer(&mesh->ldata, CD_MDISPS); diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c index 43768ef158a..5b60394feda 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.c +++ b/source/blender/blenkernel/intern/multires_reshape_util.c @@ -152,9 +152,9 @@ bool multires_reshape_context_create_from_base_mesh(MultiresReshapeContext *resh reshape_context->mmd = mmd; reshape_context->base_mesh = base_mesh; - reshape_context->base_verts = BKE_mesh_vertices(base_mesh); + reshape_context->base_verts = BKE_mesh_verts(base_mesh); reshape_context->base_edges = BKE_mesh_edges(base_mesh); - reshape_context->base_polys = BKE_mesh_polygons(base_mesh); + reshape_context->base_polys = BKE_mesh_polys(base_mesh); reshape_context->base_loops = BKE_mesh_loops(base_mesh); reshape_context->subdiv = multires_reshape_create_subdiv(NULL, object, mmd); @@ -189,9 +189,9 @@ bool multires_reshape_context_create_from_object(MultiresReshapeContext *reshape reshape_context->mmd = mmd; reshape_context->base_mesh = base_mesh; - reshape_context->base_verts = BKE_mesh_vertices(base_mesh); + reshape_context->base_verts = BKE_mesh_verts(base_mesh); reshape_context->base_edges = BKE_mesh_edges(base_mesh); - reshape_context->base_polys = BKE_mesh_polygons(base_mesh); + reshape_context->base_polys = BKE_mesh_polys(base_mesh); reshape_context->base_loops = BKE_mesh_loops(base_mesh); reshape_context->subdiv = multires_reshape_create_subdiv(depsgraph, object, mmd); @@ -220,9 +220,9 @@ bool multires_reshape_context_create_from_ccg(MultiresReshapeContext *reshape_co context_zero(reshape_context); reshape_context->base_mesh = base_mesh; - reshape_context->base_verts = BKE_mesh_vertices(base_mesh); + reshape_context->base_verts = BKE_mesh_verts(base_mesh); reshape_context->base_edges = BKE_mesh_edges(base_mesh); - reshape_context->base_polys = BKE_mesh_polygons(base_mesh); + reshape_context->base_polys = BKE_mesh_polys(base_mesh); reshape_context->base_loops = BKE_mesh_loops(base_mesh); reshape_context->subdiv = subdiv_ccg->subdiv; @@ -267,9 +267,9 @@ bool multires_reshape_context_create_from_subdiv(MultiresReshapeContext *reshape reshape_context->mmd = mmd; reshape_context->base_mesh = base_mesh; - reshape_context->base_verts = BKE_mesh_vertices(base_mesh); + reshape_context->base_verts = BKE_mesh_verts(base_mesh); reshape_context->base_edges = BKE_mesh_edges(base_mesh); - reshape_context->base_polys = BKE_mesh_polygons(base_mesh); + reshape_context->base_polys = BKE_mesh_polys(base_mesh); reshape_context->base_loops = BKE_mesh_loops(base_mesh); reshape_context->subdiv = subdiv; diff --git a/source/blender/blenkernel/intern/multires_unsubdivide.c b/source/blender/blenkernel/intern/multires_unsubdivide.c index 26ae914d67e..7884d6718af 100644 --- a/source/blender/blenkernel/intern/multires_unsubdivide.c +++ b/source/blender/blenkernel/intern/multires_unsubdivide.c @@ -640,7 +640,7 @@ static void store_grid_data(MultiresUnsubdivideContext *context, int grid_y) { Mesh *original_mesh = context->original_mesh; - const MPoly *polys = BKE_mesh_polygons(original_mesh); + const MPoly *polys = BKE_mesh_polys(original_mesh); const MLoop *loops = BKE_mesh_loops(original_mesh); const MPoly *poly = &polys[BM_elem_index_get(f)]; @@ -920,7 +920,7 @@ static void multires_unsubdivide_prepare_original_bmesh_for_extract( MultiresUnsubdivideContext *context) { Mesh *original_mesh = context->original_mesh; - const MPoly *original_polys = BKE_mesh_polygons(original_mesh); + const MPoly *original_polys = BKE_mesh_polys(original_mesh); Mesh *base_mesh = context->base_mesh; @@ -965,7 +965,7 @@ static void multires_unsubdivide_prepare_original_bmesh_for_extract( */ static bool multires_unsubdivide_flip_grid_x_axis(Mesh *mesh, int poly, int loop, int v_x) { - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); const MPoly *p = &polys[poly]; diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index ac33b11fcd2..4c3b32b6ae0 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -3191,7 +3191,7 @@ static void give_parvert(Object *par, int nr, float vec[3]) BKE_object_get_evaluated_mesh(par); if (me_eval) { - const MVert *verts = BKE_mesh_vertices(me_eval); + const MVert *verts = BKE_mesh_verts(me_eval); int count = 0; int numVerts = me_eval->totvert; @@ -4130,7 +4130,7 @@ void BKE_object_foreach_display_point(Object *ob, float3 co; if (mesh_eval != nullptr) { - const MVert *verts = BKE_mesh_vertices(mesh_eval); + const MVert *verts = BKE_mesh_verts(mesh_eval); const int totvert = mesh_eval->totvert; for (int i = 0; i < totvert; i++) { mul_v3_m4v3(co, obmat, verts[i].co); @@ -4757,7 +4757,7 @@ bool BKE_object_shapekey_remove(Main *bmain, Object *ob, KeyBlock *kb) switch (ob->type) { case OB_MESH: { Mesh *mesh = (Mesh *)ob->data; - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); BKE_keyblock_convert_to_mesh(key->refkey, verts.data(), mesh->totvert); break; } @@ -5254,7 +5254,7 @@ KDTree_3d *BKE_object_as_kdtree(Object *ob, int *r_tot) const int *index; if (me_eval && (index = (const int *)CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX))) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); /* Tree over-allocates in case where some verts have #ORIGINDEX_NONE. */ tot = 0; @@ -5271,7 +5271,7 @@ KDTree_3d *BKE_object_as_kdtree(Object *ob, int *r_tot) } } else { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); tot = verts.size(); tree = BLI_kdtree_3d_new(tot); diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 4c59b4a5210..1fe5d7aa0e7 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -166,7 +166,7 @@ bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_sele const MVert *mv; int i; - mv = BKE_mesh_vertices(me); + mv = BKE_mesh_verts(me); dv = BKE_mesh_deform_verts_for_write(me); for (i = 0; i < me->totvert; i++, mv++, dv++) { diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index d42404922e3..6db1c864918 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -628,7 +628,7 @@ static void make_duplis_verts(const DupliContext *ctx) VertexDupliData_Mesh vdd{}; vdd.params = vdd_params; vdd.totvert = me_eval->totvert; - vdd.mvert = me_eval->vertices().data(); + vdd.mvert = me_eval->verts().data(); vdd.vert_normals = BKE_mesh_vertex_normals_ensure(me_eval); vdd.orco = (const float(*)[3])CustomData_get_layer(&me_eval->vdata, CD_ORCO); @@ -1178,9 +1178,9 @@ static void make_duplis_faces(const DupliContext *ctx) FaceDupliData_Mesh fdd{}; fdd.params = fdd_params; fdd.totface = me_eval->totpoly; - fdd.mpoly = me_eval->polygons().data(); + fdd.mpoly = me_eval->polys().data(); fdd.mloop = me_eval->loops().data(); - fdd.mvert = me_eval->vertices().data(); + fdd.mvert = me_eval->verts().data(); fdd.mloopuv = (uv_idx != -1) ? (const MLoopUV *)CustomData_get_layer_n( &me_eval->ldata, CD_MLOOPUV, uv_idx) : nullptr; diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 5cf669412b2..a51d36a4a4e 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -1667,16 +1667,16 @@ static void sculpt_update_object(Depsgraph *depsgraph, /* These are assigned to the base mesh in Multires. This is needed because Face Sets operators * and tools use the Face Sets data from the base mesh when Multires is active. */ - ss->mvert = BKE_mesh_vertices_for_write(me); - ss->mpoly = BKE_mesh_polygons(me); + ss->mvert = BKE_mesh_verts_for_write(me); + ss->mpoly = BKE_mesh_polys(me); ss->mloop = BKE_mesh_loops(me); } else { ss->totvert = me->totvert; ss->totpoly = me->totpoly; ss->totfaces = me->totpoly; - ss->mvert = BKE_mesh_vertices_for_write(me); - ss->mpoly = BKE_mesh_polygons(me); + ss->mvert = BKE_mesh_verts_for_write(me); + ss->mpoly = BKE_mesh_polys(me); ss->mloop = BKE_mesh_loops(me); ss->multires.active = false; ss->multires.modifier = nullptr; @@ -1729,7 +1729,7 @@ static void sculpt_update_object(Depsgraph *depsgraph, if (need_pmap && ob->type == OB_MESH && !ss->pmap) { BKE_mesh_vert_poly_map_create(&ss->pmap, &ss->pmap_mem, - BKE_mesh_polygons(me), + BKE_mesh_polys(me), BKE_mesh_loops(me), me->totvert, me->totpoly, @@ -1751,7 +1751,7 @@ static void sculpt_update_object(Depsgraph *depsgraph, /* If the fully evaluated mesh has the same topology as the deform-only version, use it. * This matters because 'deform eval' is very restrictive and excludes even modifiers that * simply recompute vertex weights. */ - if (me_eval_deform->polygons().data() == me_eval->polygons().data() && + if (me_eval_deform->polys().data() == me_eval->polys().data() && me_eval_deform->loops().data() == me_eval->loops().data() && me_eval_deform->totvert == me_eval->totvert) { me_eval_deform = me_eval; @@ -1953,7 +1953,7 @@ void BKE_sculpt_update_object_for_edit( int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) { Mesh *me = static_cast<Mesh *>(ob->data); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); int ret = 0; @@ -2245,8 +2245,8 @@ static PBVH *build_pbvh_from_regular_mesh(Object *ob, Mesh *me_eval_deform, bool PBVH *pbvh = BKE_pbvh_new(); BKE_pbvh_respect_hide_set(pbvh, respect_hide); - MutableSpan<MVert> verts = me->vertices_for_write(); - const Span<MPoly> polys = me->polygons(); + MutableSpan<MVert> verts = me->verts_for_write(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); MLoopTri *looptri = static_cast<MLoopTri *>( diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f560b30b297..ea058ba1dc5 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1399,7 +1399,7 @@ static void init_particle_interpolation(Object *ob, pind->dietime = (key + pa->totkey - 1)->time; if (pind->mesh) { - MVert *verts = BKE_mesh_vertices_for_write(pind->mesh); + MVert *verts = BKE_mesh_verts_for_write(pind->mesh); pind->mvert[0] = &verts[pa->hair_index]; pind->mvert[1] = pind->mvert[0] + 1; } @@ -2120,7 +2120,7 @@ void psys_particle_on_dm(Mesh *mesh_final, const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh_final); if (from == PART_FROM_VERT) { - const MVert *vertices = BKE_mesh_vertices(mesh_final); + const MVert *vertices = BKE_mesh_verts(mesh_final); copy_v3_v3(vec, vertices[mapindex].co); if (nor) { @@ -2149,7 +2149,7 @@ void psys_particle_on_dm(Mesh *mesh_final, MFace *mfaces = CustomData_get_layer(&mesh_final->fdata, CD_MFACE); mface = &mfaces[mapindex]; - mvert = BKE_mesh_vertices_for_write(mesh_final); + mvert = BKE_mesh_verts_for_write(mesh_final); mtface = CustomData_get_layer(&mesh_final->fdata, CD_MTFACE); if (mtface) { @@ -3869,7 +3869,7 @@ static void psys_face_mat(Object *ob, Mesh *mesh, ParticleData *pa, float mat[4] } } else { - const MVert *verts = BKE_mesh_vertices(mesh); + const MVert *verts = BKE_mesh_verts(mesh); copy_v3_v3(v[0], verts[mface->v1].co); copy_v3_v3(v[1], verts[mface->v2].co); copy_v3_v3(v[2], verts[mface->v3].co); diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index e19b25b2da1..ed1d93647ce 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -97,7 +97,7 @@ static void distribute_grid(Mesh *mesh, ParticleSystem *psys) { ParticleData *pa = NULL; float min[3], max[3], delta[3], d; - MVert *mv, *mvert = BKE_mesh_vertices_for_write(mesh); + MVert *mv, *mvert = BKE_mesh_verts_for_write(mesh); int totvert = mesh->totvert, from = psys->part->from; int i, j, k, p, res = psys->part->grid_res, size[3], axis; @@ -576,7 +576,7 @@ static void distribute_from_volume_exec(ParticleTask *thread, ParticleData *pa, int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mface; - MVert *mvert = BKE_mesh_vertices_for_write(mesh); + MVert *mvert = BKE_mesh_verts_for_write(mesh); pa->num = i = ctx->index[p]; MFace *mfaces = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); @@ -992,7 +992,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, BKE_mesh_orco_ensure(ob, mesh); if (from == PART_FROM_VERT) { - MVert *mv = BKE_mesh_vertices_for_write(mesh); + MVert *mv = BKE_mesh_verts_for_write(mesh); const float(*orcodata)[3] = CustomData_get_layer(&mesh->vdata, CD_ORCO); int totvert = mesh->totvert; @@ -1063,7 +1063,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, } } else { - MVert *verts = BKE_mesh_vertices_for_write(mesh); + MVert *verts = BKE_mesh_verts_for_write(mesh); v1 = &verts[mf->v1]; v2 = &verts[mf->v2]; v3 = &verts[mf->v3]; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 14c4691413d..9608676a153 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3323,7 +3323,7 @@ static void hair_create_input_mesh(ParticleSimulationData *sim, if (!mesh) { *r_mesh = mesh = BKE_mesh_new_nomain(totpoint, totedge, 0, 0, 0); } - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); medge = BKE_mesh_edges_for_write(mesh); dvert = BKE_mesh_deform_verts_for_write(mesh); diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index fb078a299b5..86cccf1da69 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -364,7 +364,7 @@ static rbCollisionShape *rigidbody_get_shape_convexhull_from_mesh(Object *ob, if (ob->type == OB_MESH && ob->data) { mesh = rigidbody_get_mesh(ob); - mvert = (mesh) ? BKE_mesh_vertices_for_write(mesh) : NULL; + mvert = (mesh) ? BKE_mesh_verts_for_write(mesh) : NULL; totvert = (mesh) ? mesh->totvert : 0; } else { @@ -401,7 +401,7 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob) return NULL; } - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); totvert = mesh->totvert; looptri = BKE_mesh_runtime_looptri_ensure(mesh); tottri = mesh->runtime.looptris.len; @@ -676,7 +676,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol) return; } - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); totvert = mesh->totvert; lt = BKE_mesh_runtime_looptri_ensure(mesh); tottri = mesh->runtime.looptris.len; @@ -750,7 +750,7 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float r_center[3]) return; } - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); totvert = mesh->totvert; looptri = BKE_mesh_runtime_looptri_ensure(mesh); tottri = mesh->runtime.looptris.len; @@ -1671,7 +1671,7 @@ static void rigidbody_update_sim_ob(Depsgraph *depsgraph, Object *ob, RigidBodyO if (rbo->shape == RB_SHAPE_TRIMESH && rbo->flag & RBO_FLAG_USE_DEFORM) { Mesh *mesh = ob->runtime.mesh_deform_eval; if (mesh) { - MVert *mvert = BKE_mesh_vertices_for_write(mesh); + MVert *mvert = BKE_mesh_verts_for_write(mesh); int totvert = mesh->totvert; const BoundBox *bb = BKE_object_boundbox_get(ob); diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index bea2f8f3c4f..4b4e3bdcfa6 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -113,7 +113,7 @@ bool BKE_shrinkwrap_init_tree( } data->mesh = mesh; - data->polys = BKE_mesh_polygons(mesh); + data->polys = BKE_mesh_polys(mesh); if (shrinkType == MOD_SHRINKWRAP_NEAREST_VERTEX) { data->bvh = BKE_bvhtree_from_mesh_get(&data->treeData, mesh, BVHTREE_FROM_VERTS, 2); @@ -192,7 +192,7 @@ static void merge_vert_dir(ShrinkwrapBoundaryVertData *vdata, static ShrinkwrapBoundaryData *shrinkwrap_build_boundary_data(struct Mesh *mesh) { - const MVert *mvert = BKE_mesh_vertices(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); const MEdge *medge = BKE_mesh_edges(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); @@ -1412,7 +1412,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, if (mesh != NULL && smd->shrinkType == MOD_SHRINKWRAP_PROJECT) { /* Setup arrays to get vertexs positions, normals and deform weights */ - calc.vert = BKE_mesh_vertices_for_write(mesh); + calc.vert = BKE_mesh_verts_for_write(mesh); calc.vert_normals = BKE_mesh_vertex_normals_ensure(mesh); /* Using vertexs positions/normals as if a subsurface was applied */ @@ -1575,7 +1575,7 @@ void BKE_shrinkwrap_remesh_target_project(Mesh *src_me, Mesh *target_me, Object calc.vgroup = -1; calc.target = target_me; calc.keepDist = ssmd.keepDist; - calc.vert = BKE_mesh_vertices_for_write(src_me); + calc.vert = BKE_mesh_verts_for_write(src_me); BLI_SPACE_TRANSFORM_SETUP(&calc.local2target, ob_target, ob_target); ShrinkwrapTreeData tree; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index a426782af04..6ca598a3688 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -567,7 +567,7 @@ static void ccd_update_deflector_hash(Depsgraph *depsgraph, static int count_mesh_quads(Mesh *me) { int a, result = 0; - const MPoly *mp = BKE_mesh_polygons(me); + const MPoly *mp = BKE_mesh_polys(me); if (mp) { for (a = me->totpoly; a > 0; a--, mp++) { @@ -592,7 +592,7 @@ static void add_mesh_quad_diag_springs(Object *ob) nofquads = count_mesh_quads(me); if (nofquads) { const MLoop *mloop = BKE_mesh_loops(me); - const MPoly *mp = BKE_mesh_polygons(me); + const MPoly *mp = BKE_mesh_polys(me); BodySpring *bs; /* resize spring-array to hold additional quad springs */ @@ -2632,7 +2632,7 @@ static void springs_from_mesh(Object *ob) BodyPoint *bp; int a; float scale = 1.0f; - const MVert *vertices = BKE_mesh_vertices(me); + const MVert *vertices = BKE_mesh_verts(me); sb = ob->soft; if (me && sb) { @@ -2755,8 +2755,8 @@ static void mesh_faces_to_scratch(Object *ob) MLoopTri *looptri, *lt; BodyFace *bodyface; int a; - const MVert *vertices = BKE_mesh_vertices(me); - const MPoly *polygons = BKE_mesh_polygons(me); + const MVert *vertices = BKE_mesh_verts(me); + const MPoly *polygons = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); /* Allocate and copy faces. */ diff --git a/source/blender/blenkernel/intern/subdiv_ccg_mask.c b/source/blender/blenkernel/intern/subdiv_ccg_mask.c index 95bbbfeb17e..86891f0fa6e 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_mask.c +++ b/source/blender/blenkernel/intern/subdiv_ccg_mask.c @@ -103,7 +103,7 @@ static void free_mask_data(SubdivCCGMaskEvaluator *mask_evaluator) static int count_num_ptex_faces(const Mesh *mesh) { int num_ptex_faces = 0; - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); for (int poly_index = 0; poly_index < mesh->totpoly; poly_index++) { const MPoly *poly = &mpoly[poly_index]; num_ptex_faces += (poly->totloop == 4) ? 1 : poly->totloop; @@ -114,7 +114,7 @@ static int count_num_ptex_faces(const Mesh *mesh) static void mask_data_init_mapping(SubdivCCGMaskEvaluator *mask_evaluator, const Mesh *mesh) { GridPaintMaskData *data = mask_evaluator->user_data; - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const int num_ptex_faces = count_num_ptex_faces(mesh); /* Allocate memory. */ data->ptex_poly_corner = MEM_malloc_arrayN( @@ -142,7 +142,7 @@ static void mask_data_init_mapping(SubdivCCGMaskEvaluator *mask_evaluator, const static void mask_init_data(SubdivCCGMaskEvaluator *mask_evaluator, const Mesh *mesh) { GridPaintMaskData *data = mask_evaluator->user_data; - data->mpoly = BKE_mesh_polygons(mesh); + data->mpoly = BKE_mesh_polys(mesh); data->grid_paint_mask = CustomData_get_layer(&mesh->ldata, CD_GRID_PAINT_MASK); mask_data_init_mapping(mask_evaluator, mesh); } diff --git a/source/blender/blenkernel/intern/subdiv_ccg_material.c b/source/blender/blenkernel/intern/subdiv_ccg_material.c index e84a5b6ca46..891e1d1b630 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_material.c +++ b/source/blender/blenkernel/intern/subdiv_ccg_material.c @@ -45,7 +45,7 @@ void BKE_subdiv_ccg_material_flags_init_from_mesh( data->mesh = mesh; data->material_indices = (const int *)CustomData_get_layer_named( &mesh->pdata, CD_PROP_INT32, "material_index"); - data->polys = BKE_mesh_polygons(mesh); + data->polys = BKE_mesh_polys(mesh); material_flags_evaluator->eval_material_flags = subdiv_ccg_material_flags_eval; material_flags_evaluator->free = subdiv_ccg_material_flags_free; material_flags_evaluator->user_data = data; diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c index f908e1af4ac..b13aec37c78 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c @@ -393,9 +393,9 @@ static void init_user_data(OpenSubdiv_Converter *converter, ConverterStorage *user_data = MEM_mallocN(sizeof(ConverterStorage), __func__); user_data->settings = *settings; user_data->mesh = mesh; - user_data->verts = BKE_mesh_vertices(mesh); + user_data->verts = BKE_mesh_verts(mesh); user_data->edges = BKE_mesh_edges(mesh); - user_data->polys = BKE_mesh_polygons(mesh); + user_data->polys = BKE_mesh_polys(mesh); user_data->loops = BKE_mesh_loops(mesh); user_data->cd_vertex_crease = CustomData_get_layer(&mesh->vdata, CD_CREASE); user_data->loop_uv_indices = NULL; diff --git a/source/blender/blenkernel/intern/subdiv_displacement_multires.c b/source/blender/blenkernel/intern/subdiv_displacement_multires.c index 54078dea8da..398a4083ee2 100644 --- a/source/blender/blenkernel/intern/subdiv_displacement_multires.c +++ b/source/blender/blenkernel/intern/subdiv_displacement_multires.c @@ -361,7 +361,7 @@ static void free_displacement(SubdivDisplacement *displacement) static int count_num_ptex_faces(const Mesh *mesh) { int num_ptex_faces = 0; - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); for (int poly_index = 0; poly_index < mesh->totpoly; poly_index++) { const MPoly *poly = &mpoly[poly_index]; num_ptex_faces += (poly->totloop == 4) ? 1 : poly->totloop; @@ -372,7 +372,7 @@ static int count_num_ptex_faces(const Mesh *mesh) static void displacement_data_init_mapping(SubdivDisplacement *displacement, const Mesh *mesh) { MultiresDisplacementData *data = displacement->user_data; - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const int num_ptex_faces = count_num_ptex_faces(mesh); /* Allocate memory. */ data->ptex_poly_corner = MEM_malloc_arrayN( @@ -407,7 +407,7 @@ static void displacement_init_data(SubdivDisplacement *displacement, data->grid_size = BKE_subdiv_grid_size_from_level(mmd->totlvl); data->mesh = mesh; data->mmd = mmd; - data->mpoly = BKE_mesh_polygons(mesh); + data->mpoly = BKE_mesh_polys(mesh); data->mdisps = CustomData_get_layer(&mesh->ldata, CD_MDISPS); data->face_ptex_offset = BKE_subdiv_face_ptex_offset_get(subdiv); data->is_initialized = false; diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 91b64145396..e6f24aa6ff8 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -81,8 +81,8 @@ static void set_coarse_positions(Subdiv *subdiv, const Mesh *mesh, const float (*coarse_vertex_cos)[3]) { - const MVert *mvert = BKE_mesh_vertices(mesh); - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MVert *mvert = BKE_mesh_verts(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); /* Mark vertices which needs new coordinates. */ /* TODO(sergey): This is annoying to calculate this on every update, @@ -172,7 +172,7 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv, ctx.layer_index = layer_index; ctx.mloopuv = mluv; ctx.mesh = mesh; - ctx.polys = BKE_mesh_polygons(mesh); + ctx.polys = BKE_mesh_polys(mesh); ctx.buffer = buffer; TaskParallelSettings parallel_range_settings; diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index ac402ceaca0..faf531b0f5e 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -159,7 +159,7 @@ static void subdiv_foreach_ctx_count(SubdivForeachTaskContext *ctx) (no_quad_patch_resolution - 2); const Mesh *coarse_mesh = ctx->coarse_mesh; const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); ctx->num_subdiv_vertices = coarse_mesh->totvert; ctx->num_subdiv_edges = coarse_mesh->totedge * (num_subdiv_vertices_per_coarse_edge + 1); /* Calculate extra vertices and edges created by non-loose geometry. */ @@ -225,7 +225,7 @@ static void subdiv_foreach_ctx_init_offsets(SubdivForeachTaskContext *ctx) ctx->edge_inner_offset = ctx->edge_boundary_offset + coarse_mesh->totedge * num_subdiv_edges_per_coarse_edge; /* "Indexed" offsets. */ - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); int vertex_offset = 0; int edge_offset = 0; int polygon_offset = 0; @@ -302,7 +302,7 @@ static void subdiv_foreach_corner_vertices_regular_do( const float weights[4][2] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}}; const Mesh *coarse_mesh = ctx->coarse_mesh; const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int ptex_face_index = ctx->face_ptex_offset[coarse_poly_index]; for (int corner = 0; corner < coarse_poly->totloop; corner++) { @@ -344,7 +344,7 @@ static void subdiv_foreach_corner_vertices_special_do( { const Mesh *coarse_mesh = ctx->coarse_mesh; const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; int ptex_face_index = ctx->face_ptex_offset[coarse_poly_index]; for (int corner = 0; corner < coarse_poly->totloop; corner++, ptex_face_index++) { @@ -409,7 +409,7 @@ static void subdiv_foreach_every_corner_vertices(SubdivForeachTaskContext *ctx, return; } const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); for (int poly_index = 0; poly_index < coarse_mesh->totpoly; poly_index++) { const MPoly *coarse_poly = &coarse_mpoly[poly_index]; if (coarse_poly->totloop == 4) { @@ -435,7 +435,7 @@ static void subdiv_foreach_edge_vertices_regular_do(SubdivForeachTaskContext *ct const int num_subdiv_vertices_per_coarse_edge = resolution - 2; const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int poly_index = coarse_poly - coarse_mpoly; @@ -502,7 +502,7 @@ static void subdiv_foreach_edge_vertices_special_do(SubdivForeachTaskContext *ct const float inv_ptex_resolution_1 = 1.0f / (float)(num_vertices_per_ptex_edge - 1); const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int poly_index = coarse_poly - coarse_mpoly; @@ -597,7 +597,7 @@ static void subdiv_foreach_every_edge_vertices(SubdivForeachTaskContext *ctx, vo return; } const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); for (int poly_index = 0; poly_index < coarse_mesh->totpoly; poly_index++) { const MPoly *coarse_poly = &coarse_mpoly[poly_index]; if (coarse_poly->totloop == 4) { @@ -618,7 +618,7 @@ static void subdiv_foreach_inner_vertices_regular(SubdivForeachTaskContext *ctx, const int resolution = ctx->settings->resolution; const float inv_resolution_1 = 1.0f / (float)(resolution - 1); const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int ptex_face_index = ctx->face_ptex_offset[coarse_poly_index]; const int start_vertex_index = ctx->subdiv_vertex_offset[coarse_poly_index]; @@ -647,7 +647,7 @@ static void subdiv_foreach_inner_vertices_special(SubdivForeachTaskContext *ctx, const int ptex_face_resolution = ptex_face_resolution_get(coarse_poly, resolution); const float inv_ptex_face_resolution_1 = 1.0f / (float)(ptex_face_resolution - 1); const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; int ptex_face_index = ctx->face_ptex_offset[coarse_poly_index]; const int start_vertex_index = ctx->subdiv_vertex_offset[coarse_poly_index]; @@ -695,7 +695,7 @@ static void subdiv_foreach_inner_vertices(SubdivForeachTaskContext *ctx, static void subdiv_foreach_vertices(SubdivForeachTaskContext *ctx, void *tls, const int poly_index) { const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MPoly *coarse_poly = &coarse_mpoly[poly_index]; if (ctx->foreach_context->vertex_inner != NULL) { subdiv_foreach_inner_vertices(ctx, tls, coarse_poly); @@ -780,7 +780,7 @@ static void subdiv_foreach_edges_all_patches_regular(SubdivForeachTaskContext *c { const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int poly_index = coarse_poly - coarse_mpoly; const int resolution = ctx->settings->resolution; @@ -861,7 +861,7 @@ static void subdiv_foreach_edges_all_patches_special(SubdivForeachTaskContext *c { const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int poly_index = coarse_poly - coarse_mpoly; const int resolution = ctx->settings->resolution; @@ -988,7 +988,7 @@ static void subdiv_foreach_edges_all_patches(SubdivForeachTaskContext *ctx, static void subdiv_foreach_edges(SubdivForeachTaskContext *ctx, void *tls, int poly_index) { const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MPoly *coarse_poly = &coarse_mpoly[poly_index]; subdiv_foreach_edges_all_patches(ctx, tls, coarse_poly); } @@ -1130,7 +1130,7 @@ static void subdiv_foreach_loops_regular(SubdivForeachTaskContext *ctx, /* Base/coarse mesh information. */ const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int ptex_resolution = ptex_face_resolution_get(coarse_poly, resolution); @@ -1324,7 +1324,7 @@ static void subdiv_foreach_loops_special(SubdivForeachTaskContext *ctx, /* Base/coarse mesh information. */ const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_medge = BKE_mesh_edges(coarse_mesh); - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); const int coarse_poly_index = coarse_poly - coarse_mpoly; const int ptex_face_resolution = ptex_face_resolution_get(coarse_poly, resolution); @@ -1658,7 +1658,7 @@ static void subdiv_foreach_loops_special(SubdivForeachTaskContext *ctx, static void subdiv_foreach_loops(SubdivForeachTaskContext *ctx, void *tls, int poly_index) { const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MPoly *coarse_poly = &coarse_mpoly[poly_index]; if (coarse_poly->totloop == 4) { subdiv_foreach_loops_regular(ctx, tls, coarse_poly); @@ -1680,7 +1680,7 @@ static void subdiv_foreach_polys(SubdivForeachTaskContext *ctx, void *tls, int p const int start_poly_index = ctx->subdiv_polygon_offset[poly_index]; /* Base/coarse mesh information. */ const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MPoly *coarse_poly = &coarse_mpoly[poly_index]; const int num_ptex_faces_per_poly = num_ptex_faces_per_poly_get(coarse_poly); const int ptex_resolution = ptex_face_resolution_get(coarse_poly, resolution); @@ -1773,7 +1773,7 @@ static void subdiv_foreach_single_geometry_vertices(SubdivForeachTaskContext *ct return; } const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); for (int poly_index = 0; poly_index < coarse_mesh->totpoly; poly_index++) { const MPoly *coarse_poly = &coarse_mpoly[poly_index]; subdiv_foreach_corner_vertices(ctx, tls, coarse_poly); @@ -1784,7 +1784,7 @@ static void subdiv_foreach_single_geometry_vertices(SubdivForeachTaskContext *ct static void subdiv_foreach_mark_non_loose_geometry(SubdivForeachTaskContext *ctx) { const Mesh *coarse_mesh = ctx->coarse_mesh; - const MPoly *coarse_mpoly = BKE_mesh_polygons(coarse_mesh); + const MPoly *coarse_mpoly = BKE_mesh_polys(coarse_mesh); const MLoop *coarse_mloop = BKE_mesh_loops(coarse_mesh); for (int poly_index = 0; poly_index < coarse_mesh->totpoly; poly_index++) { const MPoly *coarse_poly = &coarse_mpoly[poly_index]; diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index c222fc46800..5a2af36e83c 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -73,9 +73,9 @@ static void subdiv_mesh_ctx_cache_uv_layers(SubdivMeshContext *ctx) static void subdiv_mesh_ctx_cache_custom_data_layers(SubdivMeshContext *ctx) { Mesh *subdiv_mesh = ctx->subdiv_mesh; - ctx->subdiv_verts = BKE_mesh_vertices_for_write(subdiv_mesh); + ctx->subdiv_verts = BKE_mesh_verts_for_write(subdiv_mesh); ctx->subdiv_edges = BKE_mesh_edges_for_write(subdiv_mesh); - ctx->subdiv_polys = BKE_mesh_polygons_for_write(subdiv_mesh); + ctx->subdiv_polys = BKE_mesh_polys_for_write(subdiv_mesh); ctx->subdiv_loops = BKE_mesh_loops_for_write(subdiv_mesh); /* Pointers to original indices layers. */ ctx->vert_origindex = static_cast<int *>( @@ -999,7 +999,7 @@ static void points_for_loose_edges_interpolation_get(const Mesh *coarse_mesh, const MEdge *neighbors[2], float points_r[4][3]) { - const MVert *coarse_mvert = BKE_mesh_vertices(coarse_mesh); + const MVert *coarse_mvert = BKE_mesh_verts(coarse_mesh); /* Middle points corresponds to the edge. */ copy_v3_v3(points_r[1], coarse_mvert[coarse_edge->v1].co); copy_v3_v3(points_r[2], coarse_mvert[coarse_edge->v2].co); @@ -1038,7 +1038,7 @@ void BKE_subdiv_mesh_interpolate_position_on_edge(const Mesh *coarse_mesh, float pos_r[3]) { if (is_simple) { - const MVert *coarse_mvert = BKE_mesh_vertices(coarse_mesh); + const MVert *coarse_mvert = BKE_mesh_verts(coarse_mesh); const MVert *vert_1 = &coarse_mvert[coarse_edge->v1]; const MVert *vert_2 = &coarse_mvert[coarse_edge->v2]; interp_v3_v3v3(pos_r, vert_1->co, vert_2->co, u); @@ -1164,9 +1164,9 @@ Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv, subdiv_context.settings = settings; subdiv_context.coarse_mesh = coarse_mesh; - subdiv_context.coarse_verts = BKE_mesh_vertices(coarse_mesh); + subdiv_context.coarse_verts = BKE_mesh_verts(coarse_mesh); subdiv_context.coarse_edges = BKE_mesh_edges(coarse_mesh); - subdiv_context.coarse_polys = BKE_mesh_polygons(coarse_mesh); + subdiv_context.coarse_polys = BKE_mesh_polys(coarse_mesh); subdiv_context.coarse_loops = BKE_mesh_loops(coarse_mesh); subdiv_context.subdiv = subdiv; diff --git a/source/blender/blenkernel/intern/volume_to_mesh.cc b/source/blender/blenkernel/intern/volume_to_mesh.cc index 2005959d360..f3bb8726b4f 100644 --- a/source/blender/blenkernel/intern/volume_to_mesh.cc +++ b/source/blender/blenkernel/intern/volume_to_mesh.cc @@ -178,8 +178,8 @@ Mesh *volume_to_mesh(const openvdb::GridBase &grid, 0, 0, 0, - mesh->vertices_for_write(), - mesh->polygons_for_write(), + mesh->verts_for_write(), + mesh->polys_for_write(), mesh->loops_for_write()); BKE_mesh_calc_edges(mesh, false, false); diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index bc856fd7a10..11d75e0d8b8 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -996,7 +996,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) if ((key = blo_do_versions_newlibadr(fd, lib, me->key)) && key->refkey) { data = key->refkey->data; tot = MIN2(me->totvert, key->refkey->totelem); - MVert *vertices = BKE_mesh_vertices_for_write(me); + MVert *vertices = BKE_mesh_verts_for_write(me); for (a = 0; a < tot; a++, data += 3) { copy_v3_v3(vertices[a].co, data); } diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index ab07c6cc6b8..b285e1829b7 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -819,12 +819,11 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) if (MAIN_VERSION_ATLEAST(bmain, 290, 2) && MAIN_VERSION_OLDER(bmain, 291, 1)) { /* In this range, the extrude manifold could generate meshes with degenerated face. */ LISTBASE_FOREACH (Mesh *, me, &bmain->meshes) { - for (const MPoly *mp = BKE_mesh_polygons(me), *mp_end = mp + me->totpoly; mp < mp_end; - mp++) { + for (const MPoly *mp = BKE_mesh_polys(me), *mp_end = mp + me->totpoly; mp < mp_end; mp++) { if (mp->totloop == 2) { bool changed; BKE_mesh_validate_arrays(me, - BKE_mesh_vertices_for_write(me), + BKE_mesh_verts_for_write(me), me->totvert, BKE_mesh_edges_for_write(me), me->totedge, @@ -832,7 +831,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) me->totface, BKE_mesh_loops_for_write(me), me->totloop, - BKE_mesh_polygons_for_write(me), + BKE_mesh_polys_for_write(me), me->totpoly, BKE_mesh_deform_verts_for_write(me), false, diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc index 257134e7661..fe9369fd652 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc @@ -366,7 +366,7 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar const int *material_indices = (const int *)CustomData_get_layer_named( &me->pdata, CD_PROP_INT32, "material_index"); - Span<MVert> mvert = me->vertices(); + Span<MVert> mvert = me->verts(); Array<BMVert *> vtable(me->totvert); for (const int i : mvert.index_range()) { BMVert *v = vtable[i] = BM_vert_create( @@ -444,7 +444,7 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar bm->elem_index_dirty &= ~BM_EDGE; /* Added in order, clear dirty flag. */ } - const Span<MPoly> mpoly = me->polygons(); + const Span<MPoly> mpoly = me->polys(); const Span<MLoop> mloop = me->loops(); /* Only needed for selection. */ @@ -1307,9 +1307,9 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks * BMVert *eve; BMEdge *eed; BMFace *efa; - MutableSpan<MVert> mvert = me->vertices_for_write(); + MutableSpan<MVert> mvert = me->verts_for_write(); MutableSpan<MEdge> medge = me->edges_for_write(); - MutableSpan<MPoly> mpoly = me->polygons_for_write(); + MutableSpan<MPoly> mpoly = me->polys_for_write(); MutableSpan<MLoop> loops = me->loops_for_write(); MLoop *mloop = loops.data(); unsigned int i, j; diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index fe73f4cfc12..eea19cbebf3 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -568,9 +568,9 @@ MeshRenderData *mesh_render_data_create(Object *object, mr->poly_len = mr->me->totpoly; mr->tri_len = poly_to_tri_count(mr->poly_len, mr->loop_len); - mr->mvert = BKE_mesh_vertices(mr->me); + mr->mvert = BKE_mesh_verts(mr->me); mr->medge = BKE_mesh_edges(mr->me); - mr->mpoly = BKE_mesh_polygons(mr->me); + mr->mpoly = BKE_mesh_polys(mr->me); mr->mloop = BKE_mesh_loops(mr->me); mr->v_origindex = static_cast<const int *>(CustomData_get_layer(&mr->me->vdata, CD_ORIGINDEX)); diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 9882ebf66f0..4e985843123 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -675,7 +675,7 @@ static void draw_subdiv_cache_extra_coarse_face_data_mesh(const MeshRenderData * Mesh *mesh, uint32_t *flags_data) { - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); for (const int i : polys.index_range()) { uint32_t flag = 0; if ((polys[i].flag & ME_SMOOTH) != 0) { @@ -1095,7 +1095,7 @@ static bool draw_subdiv_build_cache(DRWSubdivCache *cache, } /* Only build polygon related data if we have polygons. */ - const Span<MPoly> polys = mesh_eval->polygons(); + const Span<MPoly> polys = mesh_eval->polys(); if (cache->num_subdiv_loops != 0) { /* Build buffers for the PatchMap. */ draw_patch_map_build(&cache->gpu_patch_map, subdiv); @@ -2187,7 +2187,7 @@ void DRW_subdivide_loose_geom(DRWSubdivCache *subdiv_cache, MeshBufferCache *cac } /* Copy the remaining loose_verts. */ - const Span<MVert> coarse_verts = coarse_mesh->vertices(); + const Span<MVert> coarse_verts = coarse_mesh->verts(); for (int i = 0; i < coarse_loose_vert_len; i++) { const int coarse_vertex_index = cache->loose_geom.verts[i]; const MVert &coarse_vertex = coarse_verts[coarse_vertex_index]; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc index 4e3d4235487..6202fdd312d 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc @@ -129,7 +129,7 @@ static void extract_sculpt_data_init_subdiv(const DRWSubdivCache *subdiv_cache, GPUVertBuf *subdiv_mask_vbo = nullptr; const float *cd_mask = (const float *)CustomData_get_layer(cd_vdata, CD_PAINT_MASK); - const Span<MPoly> coarse_polys = coarse_mesh->polygons(); + const Span<MPoly> coarse_polys = coarse_mesh->polys(); const Span<MLoop> coarse_loops = coarse_mesh->loops(); if (cd_mask) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc index 8fe4940c6de..4db5a8c23a4 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc @@ -172,7 +172,7 @@ static void extract_weights_init_subdiv(const DRWSubdivCache *subdiv_cache, extract_weights_init(mr, cache, coarse_weights, _data); if (mr->extract_type != MR_EXTRACT_BMESH) { - const Span<MPoly> coarse_polys = coarse_mesh->polygons(); + const Span<MPoly> coarse_polys = coarse_mesh->polys(); for (const int i : coarse_polys.index_range()) { const MPoly *mpoly = &coarse_polys[i]; extract_weights_iter_poly_mesh(mr, mpoly, i, _data); diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 2cd4b53f7f4..e39cc157c19 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -204,7 +204,7 @@ static void envelope_bone_weighting(Object *ob, } /* for each vertex in the mesh */ - const MVert *mesh_verts = BKE_mesh_vertices(mesh); + const MVert *mesh_verts = BKE_mesh_verts(mesh); for (int i = 0; i < mesh->totvert; i++) { if (use_mask && !(mesh_verts[i].flag & SELECT)) { continue; @@ -406,7 +406,7 @@ static void add_verts_to_dgroups(ReportList *reports, } /* transform verts to global space */ - const MVert *mesh_verts = BKE_mesh_vertices(mesh); + const MVert *mesh_verts = BKE_mesh_verts(mesh); for (int i = 0; i < mesh->totvert; i++) { if (!vertsfilled) { copy_v3_v3(verts[i], mesh_verts[i].co); diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 2b3f8f4c853..904e6213466 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -652,8 +652,8 @@ void heat_bone_weighting(Object *ob, int a, tris_num, j, bbone, firstsegment, lastsegment; bool use_topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0; - const MVert *mesh_verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *mesh_verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0; @@ -1608,7 +1608,7 @@ static void harmonic_coordinates_bind(MeshDeformModifierData *mmd, MeshDeformBin /* initialize data from 'cagedm' for reuse */ { Mesh *me = mdb->cagemesh; - mdb->cagemesh_cache.mpoly = BKE_mesh_polygons(me); + mdb->cagemesh_cache.mpoly = BKE_mesh_polys(me); mdb->cagemesh_cache.mloop = BKE_mesh_loops(me); mdb->cagemesh_cache.looptri = BKE_mesh_runtime_looptri_ensure(me); mdb->cagemesh_cache.poly_nors = BKE_mesh_poly_normals_ensure(me); @@ -1765,7 +1765,7 @@ void ED_mesh_deform_bind_callback(Object *object, mdb.cagecos = MEM_callocN(sizeof(*mdb.cagecos) * mdb.cage_verts_num, "MeshDeformBindCos"); copy_m4_m4(mdb.cagemat, cagemat); - mvert = BKE_mesh_vertices(mdb.cagemesh); + mvert = BKE_mesh_verts(mdb.cagemesh); for (a = 0; a < mdb.cage_verts_num; a++) { copy_v3_v3(mdb.cagecos[a], mvert[a].co); } diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 3b3a7ff7ba9..bf9f5acac04 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -286,7 +286,7 @@ static void try_convert_single_object(Object &curves_ob, const bke::CurvesSurfaceTransforms transforms{curves_ob, &surface_ob}; const MFace *mfaces = (const MFace *)CustomData_get_layer(&surface_me.fdata, CD_MFACE); - const Span<MVert> verts = surface_me.vertices(); + const Span<MVert> verts = surface_me.verts(); for (const int new_hair_i : IndexRange(hair_num)) { const int curve_i = new_hair_i; @@ -542,7 +542,7 @@ static void snap_curves_to_surface_exec_object(Object &curves_ob, CurvesGeometry &curves = CurvesGeometry::wrap(curves_id.geometry); const Mesh &surface_mesh = *static_cast<const Mesh *>(surface_ob.data); - const Span<MVert> verts = surface_mesh.vertices(); + const Span<MVert> verts = surface_mesh.verts(); const Span<MLoop> loops = surface_mesh.loops(); const Span<MLoopTri> surface_looptris = {BKE_mesh_runtime_looptri_ensure(&surface_mesh), BKE_mesh_runtime_looptri_len(&surface_mesh)}; diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 6313c01011e..26184acc8b4 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -73,11 +73,11 @@ void paintface_flush_flags(bContext *C, Mesh *me_eval = (Mesh *)ob_eval->runtime.data_eval; bke::MutableAttributeAccessor attributes_eval = bke::mesh_attributes_for_write(*me_eval); bool updated = false; - const Span<MPoly> me_polys = me->polygons(); + const Span<MPoly> me_polys = me->polys(); if (me_orig != nullptr && me_eval != nullptr && me_orig->totpoly == me->totpoly) { /* Update the COW copy of the mesh. */ - MutableSpan<MPoly> orig_polys = me_orig->polygons_for_write(); + MutableSpan<MPoly> orig_polys = me_orig->polys_for_write(); for (int i = 0; i < me->totpoly; i++) { orig_polys[i].flag = me_polys[i].flag; } @@ -92,7 +92,7 @@ void paintface_flush_flags(bContext *C, /* Mesh polys => Final derived polys */ if ((index_array = (const int *)CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX))) { - MutableSpan<MPoly> eval_polys = me_orig->polygons_for_write(); + MutableSpan<MPoly> eval_polys = me_orig->polys_for_write(); /* loop over final derived polys */ for (const int i : eval_polys.index_range()) { if (index_array[i] != ORIGINDEX_NONE) { @@ -141,7 +141,7 @@ void paintface_hide(bContext *C, Object *ob, const bool unselected) return; } - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); bke::SpanAttributeWriter<bool> hide_poly = attributes.lookup_or_add_for_write_span<bool>( ".hide_poly", ATTR_DOMAIN_FACE); @@ -174,7 +174,7 @@ void paintface_reveal(bContext *C, Object *ob, const bool select) return; } - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); if (select) { @@ -207,7 +207,7 @@ static void select_linked_tfaces_with_seams(Mesh *me, const uint index, const bo BLI_bitmap *poly_tag = BLI_BITMAP_NEW(me->totpoly, __func__); const Span<MEdge> edges = me->edges(); - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); const Span<MLoop> loops = me->loops(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_poly = attributes.lookup_or_default<bool>( @@ -305,7 +305,7 @@ bool paintface_deselect_all_visible(bContext *C, Object *ob, int action, bool fl return false; } - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_poly = attributes.lookup_or_default<bool>( ".hide_poly", ATTR_DOMAIN_FACE, false); @@ -369,8 +369,8 @@ bool paintface_minmax(Object *ob, float r_min[3], float r_max[3]) copy_m3_m4(bmat, ob->obmat); - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_poly = attributes.lookup_or_default<bool>( @@ -409,7 +409,7 @@ bool paintface_mouse_select(bContext *C, /* Get the face under the cursor */ Mesh *me = BKE_mesh_from_object(ob); - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_poly = attributes.lookup_or_default<bool>( ".hide_poly", ATTR_DOMAIN_FACE, false); @@ -494,8 +494,8 @@ void paintvert_flush_flags(Object *ob) index_array = (const int *)CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX); - const Span<MVert> vertices = me->vertices_for_write(); - MutableSpan<MVert> vertices_eval = me_eval->vertices_for_write(); + const Span<MVert> vertices = me->verts_for_write(); + MutableSpan<MVert> vertices_eval = me_eval->verts_for_write(); if (index_array) { int orig_index; @@ -529,7 +529,7 @@ bool paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags) return false; } - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_vert = attributes.lookup_or_default<bool>( ".hide_vert", ATTR_DOMAIN_POINT, false); @@ -606,7 +606,7 @@ void paintvert_select_ungrouped(Object *ob, bool extend, bool flush_flags) paintvert_deselect_all_visible(ob, SEL_DESELECT, false); } - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); bke::AttributeAccessor attributes = bke::mesh_attributes(*me); const VArray<bool> hide_vert = attributes.lookup_or_default<bool>( ".hide_vert", ATTR_DOMAIN_POINT, false); @@ -635,7 +635,7 @@ void paintvert_hide(bContext *C, Object *ob, const bool unselected) return; } - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); bke::SpanAttributeWriter<bool> hide_vert = attributes.lookup_or_add_for_write_span<bool>( ".hide_vert", ATTR_DOMAIN_POINT); @@ -668,7 +668,7 @@ void paintvert_reveal(bContext *C, Object *ob, const bool select) return; } - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*me); const VArray<bool> hide_vert = attributes.lookup_or_default<bool>( ".hide_vert", ATTR_DOMAIN_POINT, false); diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index 09673b3d7ad..4ee518b5662 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -225,7 +225,7 @@ void ED_mesh_uv_loop_reset_ex(Mesh *me, const int layernum) BLI_assert(CustomData_has_layer(&me->ldata, CD_MLOOPUV)); MLoopUV *mloopuv = (MLoopUV *)CustomData_get_layer_n(&me->ldata, CD_MLOOPUV, layernum); - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); for (int i = 0; i < me->totpoly; i++) { mesh_uv_reset_mface(&polys[i], mloopuv); } @@ -776,9 +776,9 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator /* Tag edges as sharp according to smooth threshold if needed, * to preserve autosmooth shading. */ if (me->flag & ME_AUTOSMOOTH) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); MutableSpan<MEdge> edges = me->edges_for_write(); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); BKE_edges_sharp_from_angle_set(verts.data(), @@ -893,7 +893,7 @@ static void mesh_add_verts(Mesh *mesh, int len) const int old_vertex_num = mesh->totvert; mesh->totvert = totvert; - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); for (MVert &vert : verts.drop_front(old_vertex_num)) { vert.flag = SELECT; } @@ -986,7 +986,7 @@ static void mesh_add_polys(Mesh *mesh, int len) const int old_polys_num = mesh->totpoly; mesh->totpoly = totpoly; - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); for (MPoly &poly : polys.drop_front(old_polys_num)) { poly.flag = ME_FACE_SEL; } diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 905eb5d43e1..ad5a5d362f1 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -55,7 +55,7 @@ void ED_mesh_mirror_spatial_table_begin(Object *ob, BMEditMesh *em, Mesh *me_eva } } else { - const MVert *verts = BKE_mesh_vertices(me_eval ? me_eval : me); + const MVert *verts = BKE_mesh_verts(me_eval ? me_eval : me); for (int i = 0; i < totvert; i++) { BLI_kdtree_3d_insert(MirrKdStore.tree, i, verts[i].co); } diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index 88c204b56e9..ad7f504c87b 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -906,7 +906,7 @@ static bool ed_mesh_mirror_topo_table_update(Object *ob, Mesh *me_eval) static int mesh_get_x_mirror_vert_spatial(Object *ob, Mesh *me_eval, int index) { Mesh *me = static_cast<Mesh *>(ob->data); - const Span<MVert> verts = me_eval ? me_eval->vertices() : me->vertices(); + const Span<MVert> verts = me_eval ? me_eval->verts() : me->verts(); float vec[3]; @@ -1143,7 +1143,7 @@ int *mesh_get_x_mirror_faces(Object *ob, BMEditMesh *em, Mesh *me_eval) mirrorverts = static_cast<int *>(MEM_callocN(sizeof(int) * totvert, "MirrorVerts")); mirrorfaces = static_cast<int *>(MEM_callocN(sizeof(int[2]) * totface, "MirrorFaces")); - const Span<MVert> verts = me_eval ? me_eval->vertices() : me->vertices(); + const Span<MVert> verts = me_eval ? me_eval->verts() : me->verts(); MFace *mface = (MFace *)CustomData_get_layer(&(me_eval ? me_eval : me)->fdata, CD_MFACE); ED_mesh_mirror_spatial_table_begin(ob, em, me_eval); @@ -1275,8 +1275,8 @@ bool ED_mesh_pick_face_vert( const float mval_f[2] = {(float)mval[0], (float)mval[1]}; float len_best = FLT_MAX; - const Span<MVert> verts = me_eval->vertices(); - const Span<MPoly> polys = me_eval->polygons(); + const Span<MVert> verts = me_eval->verts(); + const Span<MPoly> polys = me_eval->polys(); const Span<MLoop> loops = me_eval->loops(); const int *index_mp_to_orig = (const int *)CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX); @@ -1411,7 +1411,7 @@ bool ED_mesh_pick_vert( } /* setup data */ - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); data.mvert = verts.data(); data.region = region; data.mval_f = mval_f; diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 2e07214a5b3..8db699cceb8 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -1028,8 +1028,8 @@ static void bake_targets_populate_pixels_color_attributes(BakeTargets *targets, const MLoop *loops = BKE_mesh_loops(me_eval); BKE_mesh_recalc_looptri(loops, - BKE_mesh_polygons(me_eval), - BKE_mesh_vertices(me_eval), + BKE_mesh_polys(me_eval), + BKE_mesh_verts(me_eval), me_eval->totloop, me_eval->totpoly, looptri); @@ -1037,7 +1037,7 @@ static void bake_targets_populate_pixels_color_attributes(BakeTargets *targets, /* For mapping back to original mesh in case there are modifiers. */ const int *vert_origindex = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX); const int *poly_origindex = CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX); - const MPoly *orig_polys = BKE_mesh_polygons(me); + const MPoly *orig_polys = BKE_mesh_polys(me); const MLoop *orig_loops = BKE_mesh_loops(me); for (int i = 0; i < tottri; i++) { diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 5e642a00727..8bbceccab28 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -593,7 +593,7 @@ bool ED_object_modifier_convert_psys_to_mesh(ReportList *UNUSED(reports), CustomData_add_layer(&me->edata, CD_MEDGE, CD_SET_DEFAULT, nullptr, edges_num); CustomData_add_layer(&me->fdata, CD_MFACE, CD_SET_DEFAULT, nullptr, 0); - blender::MutableSpan<MVert> verts = me->vertices_for_write(); + blender::MutableSpan<MVert> verts = me->verts_for_write(); blender::MutableSpan<MEdge> edges = me->edges_for_write(); MVert *mvert = verts.data(); MEdge *medge = edges.data(); @@ -2639,7 +2639,7 @@ static void skin_armature_bone_create(Object *skin_ob, static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, Object *skin_ob) { Mesh *me = static_cast<Mesh *>(skin_ob->data); - const Span<MVert> me_verts = me->vertices(); + const Span<MVert> me_verts = me->verts(); const Span<MEdge> me_edges = me->edges(); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); @@ -2647,7 +2647,7 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, const Mesh *me_eval_deform = mesh_get_eval_deform( depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH); - const Span<MVert> verts_eval = me_eval_deform->vertices(); + const Span<MVert> verts_eval = me_eval_deform->verts(); /* add vertex weights to original mesh */ CustomData_add_layer(&me->vdata, CD_MDEFORMVERT, CD_SET_DEFAULT, nullptr, me->totvert); diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 56cccd984b6..c93d7dc3ee5 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -131,7 +131,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op) } /* Output mesh will be all smooth or all flat shading. */ - const Span<MPoly> polygons = mesh->polygons(); + const Span<MPoly> polygons = mesh->polys(); const bool smooth_normals = polygons.first().flag & ME_SMOOTH; float isovalue = 0.0f; @@ -682,7 +682,7 @@ static bool mesh_is_manifold_consistent(Mesh *mesh) * check that the direction of the faces are consistent and doesn't suddenly * flip */ - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); const Span<MEdge> edges = mesh->edges(); const Span<MLoop> loops = mesh->loops(); diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 19c26edfb05..d2cb7ad4b43 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -200,7 +200,7 @@ bool ED_vgroup_parray_alloc(ID *id, return true; } if (!me->deform_verts().is_empty()) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); MutableSpan<MDeformVert> dverts = me->deform_verts_for_write(); *dvert_tot = me->totvert; @@ -663,7 +663,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type) } } else { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); int v_act; dvert_act = ED_mesh_active_dvert_get_ob(ob, &v_act); @@ -1056,7 +1056,7 @@ static void vgroup_select_verts(Object *ob, int select) MVert *mv; int i; - mv = me->vertices_for_write().data(); + mv = me->verts_for_write().data(); for (i = 0; i < me->totvert; i++, mv++) { if (!(hide_vert != nullptr && hide_vert[i])) { @@ -1218,7 +1218,7 @@ static bool vgroup_normalize(Object *ob) * count is an int passed by reference so it can be assigned the value of the length here. */ static blender::Vector<int> getSurroundingVerts(Mesh *me, int vert) { - const MPoly *mp = me->polygons().data(); + const MPoly *mp = me->polys().data(); const MLoop *loops = me->loops().data(); int i = me->totpoly; @@ -1377,7 +1377,7 @@ static void moveCloserToDistanceFromPlane(Depsgraph *depsgraph, do { wasChange = false; me_deform = mesh_get_eval_deform(depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); - const Span<MVert> verts = me_deform->vertices(); + const Span<MVert> verts = me_deform->verts(); m = verts[index]; copy_v3_v3(oldPos, m.co); distToStart = dot_v3v3(norm, oldPos) + d; @@ -1525,7 +1525,7 @@ static void vgroup_fix( int i; Mesh *me = static_cast<Mesh *>(ob->data); - MVert *mvert = me->vertices_for_write().data(); + MVert *mvert = me->verts_for_write().data(); if (!(me->editflag & ME_EDIT_PAINT_VERT_SEL)) { return; } @@ -1540,7 +1540,7 @@ static void vgroup_fix( Mesh *me_deform = mesh_get_eval_deform( depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); - const Span<MVert> verts_deform = me_deform->vertices(); + const Span<MVert> verts_deform = me_deform->verts(); k = count; while (k--) { p[k] = verts_deform[verts[k]]; @@ -1975,7 +1975,7 @@ static void vgroup_smooth_subset(Object *ob, } } else { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const blender::Span<MEdge> edges = me->edges(); for (int i = 0; i < dvert_tot; i++) { const MVert *v = &verts[i]; @@ -2053,7 +2053,7 @@ static void vgroup_smooth_subset(Object *ob, const blender::Span<MEdge> edges = me->edges(); /* checked already */ - BLI_assert(IS_ME_VERT_WRITE(&me->vertices()[i])); + BLI_assert(IS_ME_VERT_WRITE(&me->verts()[i])); for (j = 0; j < emap[i].count; j++) { const MEdge *e = &edges[emap[i].indices[j]]; @@ -2471,7 +2471,7 @@ void ED_vgroup_mirror(Object *ob, } BLI_bitmap *vert_tag = BLI_BITMAP_NEW(me->totvert, __func__); - const MVert *verts = me->vertices().data(); + const MVert *verts = me->verts().data(); MutableSpan<MDeformVert> dverts = me->deform_verts_for_write(); for (vidx = 0, mv = verts; vidx < me->totvert; vidx++, mv++) { @@ -2625,7 +2625,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) } } else { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); MutableSpan<MDeformVert> dverts = me->deform_verts_for_write(); MDeformVert *dv = dverts.data(); @@ -4356,7 +4356,7 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) return; } - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); MutableSpan<MDeformVert> dverts = me->deform_verts_for_write(); dv = dverts.data(); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index c0f19a7e30d..30dab322fbc 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1451,7 +1451,7 @@ void recalc_emitter_field(Depsgraph *UNUSED(depsgraph), Object *UNUSED(ob), Part vec = edit->emitter_cosnos; nor = vec + 3; - const MVert *verts = BKE_mesh_vertices(mesh); + const MVert *verts = BKE_mesh_verts(mesh); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh); MFace *mfaces = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); for (i = 0; i < totface; i++, vec += 6, nor += 6) { @@ -4180,7 +4180,7 @@ static int particle_intersect_mesh(Depsgraph *depsgraph, totface = mesh->totface; mface = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); /* lets intersect the faces */ for (i = 0; i < totface; i++, mface++) { diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index a9fa325c341..f13b7519cd7 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -750,7 +750,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph, BKE_mesh_tessface_ensure(mesh); numverts = mesh->totvert; - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); /* convert to global coordinates */ for (int i = 0; i < numverts; i++) { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 3b13575f7bb..d452d94d2f0 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -142,7 +142,7 @@ struct AddOperationExecutor { report_empty_evaluated_surface(stroke_extension.reports); return; } - surface_verts_eval_ = surface_eval_->vertices(); + surface_verts_eval_ = surface_eval_->verts(); surface_loops_eval_ = surface_eval_->loops(); surface_looptris_eval_ = {BKE_mesh_runtime_looptri_ensure(surface_eval_), BKE_mesh_runtime_looptri_len(surface_eval_)}; diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index 062bacc7add..ec69aae372c 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -119,7 +119,7 @@ struct PuffOperationExecutor { reinterpret_cast<const float3 *>(CustomData_get_layer(&surface_->ldata, CD_NORMAL)), surface_->totloop}; - surface_verts_ = surface_->vertices(); + surface_verts_ = surface_->verts(); surface_loops_ = surface_->loops(); surface_looptris_ = {BKE_mesh_runtime_looptri_ensure(surface_), BKE_mesh_runtime_looptri_len(surface_)}; diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index e65d81a4225..833f00ae0d0 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -177,8 +177,8 @@ struct SlideOperationExecutor { if (surface_orig_->totpoly == 0) { report_empty_original_surface(stroke_extension.reports); return; - } - surface_looptris_orig_ = {BKE_mesh_runtime_looptri_ensure(surface_orig_), + } + surface_looptris_orig_ = {BKE_mesh_runtime_looptri_ensure(surface_orig_), BKE_mesh_runtime_looptri_len(surface_orig_)}; surface_uv_map_orig_ = bke::mesh_attributes(*surface_orig_).lookup<float2>(uv_map_name, ATTR_DOMAIN_CORNER); @@ -207,7 +207,7 @@ struct SlideOperationExecutor { } surface_looptris_eval_ = {BKE_mesh_runtime_looptri_ensure(surface_eval_), BKE_mesh_runtime_looptri_len(surface_eval_)}; - surface_verts_eval_ = surface_eval_->vertices(); + surface_verts_eval_ = surface_eval_->verts(); surface_loops_eval_ = surface_eval_->loops(); surface_uv_map_eval_ = bke::mesh_attributes(*surface_eval_).lookup<float2>(uv_map_name, ATTR_DOMAIN_CORNER); @@ -323,7 +323,7 @@ struct SlideOperationExecutor { { const float4x4 brush_transform_inv = brush_transform.inverted(); - const Span<MVert> verts_orig_su = surface_orig_->vertices(); + const Span<MVert> verts_orig_su = surface_orig_->verts(); const Span<MLoop> loops_orig = surface_orig_->loops(); MutableSpan<float3> positions_orig_cu = curves_orig_->positions_for_write(); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index f1e6c7bf8dd..1ca5df47e17 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4055,13 +4055,13 @@ static bool proj_paint_state_mesh_eval_init(const bContext *C, ProjPaintState *p } ps->mat_array[totmat - 1] = NULL; - ps->mvert_eval = BKE_mesh_vertices(ps->me_eval); + ps->mvert_eval = BKE_mesh_verts(ps->me_eval); ps->vert_normals = BKE_mesh_vertex_normals_ensure(ps->me_eval); if (ps->do_mask_cavity) { ps->medge_eval = BKE_mesh_edges(ps->me_eval); } ps->mloop_eval = BKE_mesh_loops(ps->me_eval); - ps->mpoly_eval = BKE_mesh_polygons(ps->me_eval); + ps->mpoly_eval = BKE_mesh_polys(ps->me_eval); ps->material_indices = (const int *)CustomData_get_layer_named( &ps->me_eval->pdata, CD_PROP_INT32, "material_index"); @@ -4155,7 +4155,7 @@ static void proj_paint_face_lookup_init(const ProjPaintState *ps, ProjPaintFaceL memset(face_lookup, 0, sizeof(*face_lookup)); if (ps->do_face_sel) { face_lookup->index_mp_to_orig = CustomData_get_layer(&ps->me_eval->pdata, CD_ORIGINDEX); - face_lookup->mpoly_orig = BKE_mesh_polygons((Mesh *)ps->ob->data); + face_lookup->mpoly_orig = BKE_mesh_polys((Mesh *)ps->ob->data); } } diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 34c5fc3124c..332a0830081 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -1123,7 +1123,7 @@ static void sculpt_gesture_trim_geometry_generate(SculptGestureContext *sgcontex const float(*ob_imat)[4] = vc->obact->imat; /* Write vertices coordinates for the front face. */ - MVert *verts = BKE_mesh_vertices_for_write(trim_operation->mesh); + MVert *verts = BKE_mesh_verts_for_write(trim_operation->mesh); float depth_point[3]; madd_v3_v3v3fl(depth_point, shape_origin, shape_normal, depth_front); for (int i = 0; i < tot_screen_points; i++) { @@ -1160,7 +1160,7 @@ static void sculpt_gesture_trim_geometry_generate(SculptGestureContext *sgcontex BLI_polyfill_calc(screen_points, tot_screen_points, 0, r_tris); /* Write the front face triangle indices. */ - MPoly *polys = BKE_mesh_polygons_for_write(trim_operation->mesh); + MPoly *polys = BKE_mesh_polys_for_write(trim_operation->mesh); MLoop *loops = BKE_mesh_loops_for_write(trim_operation->mesh); MPoly *mp = polys; MLoop *ml = loops; @@ -1333,7 +1333,7 @@ static void sculpt_gesture_trim_apply_for_symmetry_pass(bContext *UNUSED(C), { SculptGestureTrimOperation *trim_operation = (SculptGestureTrimOperation *)sgcontext->operation; Mesh *trim_mesh = trim_operation->mesh; - MVert *verts = BKE_mesh_vertices_for_write(trim_mesh); + MVert *verts = BKE_mesh_verts_for_write(trim_mesh); for (int i = 0; i < trim_mesh->totvert; i++) { flip_v3_v3(verts[i].co, trim_operation->true_mesh_co[i], sgcontext->symmpass); } diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 7336166d651..1cedcde7035 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -288,7 +288,7 @@ static void imapaint_pick_uv( const MLoopTri *lt = BKE_mesh_runtime_looptri_ensure(me_eval); const int tottri = me_eval->runtime.looptris.len; - const MVert *mvert = BKE_mesh_vertices(me_eval); + const MVert *mvert = BKE_mesh_verts(me_eval); const MLoop *mloop = BKE_mesh_loops(me_eval); const int *index_mp_to_orig = CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 2d2033cac96..c38a79cb6bb 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -1237,7 +1237,7 @@ static void vertex_paint_init_session_data(const ToolSettings *ts, Object *ob) } Mesh *me = (Mesh *)ob->data; - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); if (gmap->vert_to_loop == nullptr) { @@ -4088,8 +4088,8 @@ static bool vertex_color_set(Object *ob, ColorPaint4f paintcol_in, CustomDataLay } else { Color *color_layer = static_cast<Color *>(layer->data); - const Span<MVert> verts = me->vertices(); - const Span<MPoly> polys = me->polygons(); + const Span<MVert> verts = me->verts(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); for (const int i : polys.index_range()) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index 7aa0adfc3d4..006ceb5f136 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -159,8 +159,8 @@ static IndexMask get_selected_indices(const Mesh &mesh, Vector<int64_t> &indices) { using namespace blender; - Span<MVert> verts = mesh.vertices(); - Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); bke::AttributeAccessor attributes = bke::mesh_attributes(mesh); diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index f40a287adf6..0a0d7cff214 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -317,7 +317,7 @@ static const EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C, ED_view3d_viewcontext_init(C, &vc, depsgraph); me = BKE_mesh_from_object(vc.obact); - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); const MDeformVert *dverts = BKE_mesh_deform_verts(me); @@ -445,8 +445,8 @@ static bool weight_paint_set(Object *ob, float paintweight) /* mutually exclusive, could be made into a */ const short paint_selmode = ME_EDIT_PAINT_SEL_MODE(me); - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); MDeformVert *dvert = BKE_mesh_deform_verts_for_write(me); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 6ccb756099f..5a17d42468e 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3162,7 +3162,7 @@ void SCULPT_vertcos_to_key(Object *ob, KeyBlock *kb, const float (*vertCos)[3]) /* Modifying of basis key should update mesh. */ if (kb == me->key->refkey) { - MVert *verts = BKE_mesh_vertices_for_write(me); + MVert *verts = BKE_mesh_verts_for_write(me); for (a = 0; a < me->totvert; a++) { copy_v3_v3(verts[a].co, vertCos[a]); @@ -3589,7 +3589,7 @@ static void sculpt_flush_pbvhvert_deform(Object *ob, PBVHVertexIter *vd) copy_v3_v3(ss->deform_cos[index], vd->co); copy_v3_v3(ss->orig_cos[index], newco); - MVert *verts = BKE_mesh_vertices_for_write(me); + MVert *verts = BKE_mesh_verts_for_write(me); if (!ss->shapekey_active) { copy_v3_v3(verts[index].co, newco); } @@ -5910,7 +5910,7 @@ void SCULPT_boundary_info_ensure(Object *object) Mesh *base_mesh = BKE_mesh_from_object(object); const MEdge *edges = BKE_mesh_edges(base_mesh); - const MPoly *polys = BKE_mesh_polygons(base_mesh); + const MPoly *polys = BKE_mesh_polys(base_mesh); const MLoop *loops = BKE_mesh_loops(base_mesh); ss->vertex_info.boundary = BLI_BITMAP_NEW(base_mesh->totvert, "Boundary info"); diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c index 63d5c14a931..7c4c47261b3 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.c +++ b/source/blender/editors/sculpt_paint/sculpt_expand.c @@ -776,7 +776,7 @@ static void sculpt_expand_grids_to_faces_falloff(SculptSession *ss, Mesh *mesh, ExpandCache *expand_cache) { - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh); for (int p = 0; p < mesh->totpoly; p++) { @@ -794,7 +794,7 @@ static void sculpt_expand_grids_to_faces_falloff(SculptSession *ss, static void sculpt_expand_vertex_to_faces_falloff(Mesh *mesh, ExpandCache *expand_cache) { - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); for (int p = 0; p < mesh->totpoly; p++) { @@ -1940,7 +1940,7 @@ static void sculpt_expand_delete_face_set_id(int *r_face_sets, { const int totface = ss->totfaces; MeshElemMap *pmap = ss->pmap; - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); /* Check that all the face sets IDs in the mesh are not equal to `delete_id` diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c index c8e546ecef3..b89944628da 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.c +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c @@ -1096,7 +1096,7 @@ static void sculpt_face_set_grow(Object *ob, const bool modify_hidden) { Mesh *mesh = BKE_mesh_from_object(ob); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); for (int p = 0; p < mesh->totpoly; p++) { @@ -1127,7 +1127,7 @@ static void sculpt_face_set_shrink(Object *ob, const bool modify_hidden) { Mesh *mesh = BKE_mesh_from_object(ob); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); for (int p = 0; p < mesh->totpoly; p++) { if (!modify_hidden && prev_face_sets[p] <= 0) { diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c index 4b871da1d02..c07c6126405 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c @@ -109,7 +109,7 @@ static float *SCULPT_geodesic_mesh_create(Object *ob, MVert *verts = SCULPT_mesh_deformed_mverts_get(ss); const MEdge *edges = BKE_mesh_edges(mesh); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); float *dists = MEM_malloc_arrayN(totvert, sizeof(float), "distances"); diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index 3c79e66f436..61782186402 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -169,7 +169,7 @@ std::unique_ptr<ColumnValues> GeometryDataSource::get_column_values( const MeshComponent &component = static_cast<const MeshComponent &>(*component_); if (const Mesh *mesh = component.get_for_read()) { const Span<MEdge> edges = mesh->edges(); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); if (domain_ == ATTR_DOMAIN_EDGE) { diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 2019ff28e33..36ced74a8b7 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -68,8 +68,8 @@ void ED_draw_object_facemap(Depsgraph *depsgraph, if (facemap_data) { GPU_blend(GPU_BLEND_ALPHA); - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); int mpoly_len = me->totpoly; diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index 4d5068c45ad..60141fd00cd 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -301,7 +301,7 @@ void meshobject_foreachScreenVert( data.func = func; data.userData = userData; data.clip_flag = clip_flag; - data.verts = BKE_mesh_vertices_for_write((Mesh *)vc->obact->data); + data.verts = BKE_mesh_verts_for_write((Mesh *)vc->obact->data); data.hide_vert = (const bool *)CustomData_get_layer_named( &me->vdata, CD_PROP_BOOL, ".hide_vert"); diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 714eff79777..2424ea5b5d7 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -334,7 +334,7 @@ static bool edbm_backbuf_check_and_select_verts_obmode(Mesh *me, EditSelectBuf_Cache *esel, const eSelectOp sel_op) { - MVert *verts = BKE_mesh_vertices_for_write(me); + MVert *verts = BKE_mesh_verts_for_write(me); MVert *mv = verts; bool changed = false; @@ -364,7 +364,7 @@ static bool edbm_backbuf_check_and_select_faces_obmode(Mesh *me, EditSelectBuf_Cache *esel, const eSelectOp sel_op) { - MPoly *polygons = BKE_mesh_polygons_for_write(me); + MPoly *polygons = BKE_mesh_polys_for_write(me); bool changed = false; const BLI_bitmap *select_bitmap = esel->select_bitmap; @@ -2814,7 +2814,7 @@ static bool ed_wpaint_vertex_select_pick(bContext *C, Mesh *me = static_cast<Mesh *>(obact->data); /* already checked for nullptr */ uint index = 0; - MVert *verts = BKE_mesh_vertices_for_write(me); + MVert *verts = BKE_mesh_verts_for_write(me); MVert *mv; bool changed = false; @@ -3434,8 +3434,7 @@ static bool do_mesh_box_select(ViewContext *vc, } if (ts->selectmode & SCE_SELECT_EDGE) { /* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */ - struct BoxSelectUserData_ForMeshEdge cb_data { - }; + struct BoxSelectUserData_ForMeshEdge cb_data {}; cb_data.data = &data; cb_data.esel = use_zbuf ? esel : nullptr; cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem( diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index 3bd090850f4..c72511d213d 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -244,9 +244,9 @@ static SnapData_Mesh *snap_object_data_mesh_get(SnapObjectContext *sctx, SnapData_Mesh *sod; bool init = false; - const Span<MVert> verts = me_eval->vertices(); + const Span<MVert> verts = me_eval->verts(); const Span<MEdge> edges = me_eval->edges(); - const Span<MPoly> polys = me_eval->polygons(); + const Span<MPoly> polys = me_eval->polys(); const Span<MLoop> loops = me_eval->loops(); if (std::unique_ptr<SnapData_Mesh> *sod_p = sctx->mesh_caches.lookup_ptr(ob_eval)) { diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 1aa3f2cc54a..b01c04471ae 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -399,8 +399,8 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) { char *name = ob->id.name + 2; - const Span<MVert> mesh_verts = me->vertices(); - const Span<MPoly> mesh_polys = me->polygons(); + const Span<MVert> mesh_verts = me->verts(); + const Span<MPoly> mesh_polys = me->polys(); const Span<MLoop> mesh_loops = me->loops(); // Compute loop triangles diff --git a/source/blender/geometry/intern/add_curves_on_mesh.cc b/source/blender/geometry/intern/add_curves_on_mesh.cc index 7490694bf12..e06ee55afa0 100644 --- a/source/blender/geometry/intern/add_curves_on_mesh.cc +++ b/source/blender/geometry/intern/add_curves_on_mesh.cc @@ -245,7 +245,7 @@ AddCurvesOnMeshOutputs add_curves_on_mesh(CurvesGeometry &curves, Vector<float2> used_uvs; /* Find faces that the passed in uvs belong to. */ - const Span<MVert> surface_verts = inputs.surface->vertices(); + const Span<MVert> surface_verts = inputs.surface->verts(); const Span<MLoop> surface_loops = inputs.surface->loops(); for (const int i : inputs.uvs.index_range()) { const float2 &uv = inputs.uvs[i]; diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc index ad39f686dd4..831241aa274 100644 --- a/source/blender/geometry/intern/mesh_merge_by_distance.cc +++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc @@ -1166,7 +1166,7 @@ static void weld_mesh_context_create(const Mesh &mesh, { const int mvert_len = mesh.totvert; const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); Vector<WeldVert> wvert = weld_vert_ctx_alloc_and_setup(vert_dest_map, vert_kill_len); @@ -1360,7 +1360,7 @@ static Mesh *create_merged_mesh(const Mesh &mesh, MutableSpan<int> vert_dest_map, const int removed_vertex_count) { - const Span<MPoly> src_polys = mesh.polygons(); + const Span<MPoly> src_polys = mesh.polys(); const Span<MLoop> src_loops = mesh.loops(); const int totvert = mesh.totvert; const int totedge = mesh.totedge; @@ -1376,7 +1376,7 @@ static Mesh *create_merged_mesh(const Mesh &mesh, Mesh *result = BKE_mesh_new_nomain_from_template( &mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys); MutableSpan<MEdge> dst_edges = result->edges_for_write(); - MutableSpan<MPoly> dst_polys = result->polygons_for_write(); + MutableSpan<MPoly> dst_polys = result->polys_for_write(); MutableSpan<MLoop> dst_loops = result->loops_for_write(); /* Vertices. */ @@ -1570,7 +1570,7 @@ std::optional<Mesh *> mesh_merge_by_distance_all(const Mesh &mesh, KDTree_3d *tree = BLI_kdtree_3d_new(selection.size()); - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); for (const int i : selection) { BLI_kdtree_3d_insert(tree, i, verts[i].co); } @@ -1597,7 +1597,7 @@ std::optional<Mesh *> mesh_merge_by_distance_connected(const Mesh &mesh, const float merge_distance, const bool only_loose_edges) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); int vert_kill_len = 0; diff --git a/source/blender/geometry/intern/mesh_primitive_cuboid.cc b/source/blender/geometry/intern/mesh_primitive_cuboid.cc index 1e734a82e43..528a9e72e9e 100644 --- a/source/blender/geometry/intern/mesh_primitive_cuboid.cc +++ b/source/blender/geometry/intern/mesh_primitive_cuboid.cc @@ -405,8 +405,8 @@ Mesh *create_cuboid_mesh(const float3 &size, Mesh *mesh = BKE_mesh_new_nomain( config.vertex_count, 0, 0, config.loop_count, config.poly_count); - MutableSpan<MVert> verts = mesh->vertices_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); calculate_vertices(config, verts); diff --git a/source/blender/geometry/intern/mesh_to_curve_convert.cc b/source/blender/geometry/intern/mesh_to_curve_convert.cc index 1951c960d0d..dab373f475b 100644 --- a/source/blender/geometry/intern/mesh_to_curve_convert.cc +++ b/source/blender/geometry/intern/mesh_to_curve_convert.cc @@ -224,7 +224,7 @@ static Vector<std::pair<int, int>> get_selected_edges(const Mesh &mesh, const In bke::CurvesGeometry mesh_to_curve_convert(const Mesh &mesh, const IndexMask selection) { Vector<std::pair<int, int>> selected_edges = get_selected_edges(mesh, selection); - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); CurveFromEdgesOutput output = edges_to_curve_point_indices(verts, selected_edges); return create_curve_from_vert_indices( diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc index 39078b1c511..0c0d550fc99 100644 --- a/source/blender/geometry/intern/mesh_to_volume.cc +++ b/source/blender/geometry/intern/mesh_to_volume.cc @@ -30,7 +30,7 @@ class OpenVDBMeshAdapter { }; OpenVDBMeshAdapter::OpenVDBMeshAdapter(const Mesh &mesh, float4x4 transform) - : vertices_(mesh.vertices()), loops_(mesh.loops()), transform_(transform) + : vertices_(mesh.verts()), loops_(mesh.loops()), transform_(transform) { /* This only updates a cache and can be considered to be logically const. */ const MLoopTri *looptris = BKE_mesh_runtime_looptri_ensure(&mesh); diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 8d1c43866eb..b230b938ee9 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -864,9 +864,9 @@ static AllMeshesInfo preprocess_meshes(const GeometrySet &geometry_set, MeshRealizeInfo &mesh_info = info.realize_info[mesh_index]; const Mesh *mesh = info.order[mesh_index]; mesh_info.mesh = mesh; - mesh_info.verts = mesh->vertices(); + mesh_info.verts = mesh->verts(); mesh_info.edges = mesh->edges(); - mesh_info.polys = mesh->polygons(); + mesh_info.polys = mesh->polys(); mesh_info.loops = mesh->loops(); /* Create material index mapping. */ @@ -1046,9 +1046,9 @@ static void execute_realize_mesh_tasks(const RealizeInstancesOptions &options, MeshComponent &dst_component = r_realized_geometry.get_component_for_write<MeshComponent>(); dst_component.replace(dst_mesh); bke::MutableAttributeAccessor dst_attributes = bke::mesh_attributes_for_write(*dst_mesh); - MutableSpan<MVert> dst_verts = dst_mesh->vertices_for_write(); + MutableSpan<MVert> dst_verts = dst_mesh->verts_for_write(); MutableSpan<MEdge> dst_edges = dst_mesh->edges_for_write(); - MutableSpan<MPoly> dst_polys = dst_mesh->polygons_for_write(); + MutableSpan<MPoly> dst_polys = dst_mesh->polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh->loops_for_write(); /* Copy settings from the first input geometry set with a mesh. */ diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index 95341a0eeb5..c4a235d06bc 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -1638,7 +1638,7 @@ static void lineart_identify_mlooptri_feature_edges(void *__restrict userdata, } if (!only_contour) { - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); if (ld->conf.use_crease) { bool do_crease = true; @@ -1896,7 +1896,7 @@ static void lineart_load_tri_task(void *__restrict userdata, double gn[3]; float no[3]; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); normal_tri_v3(no, verts[v1].co, verts[v2].co, verts[v3].co); copy_v3db_v3fl(gn, no); mul_v3_mat3_m4v3_db(tri->gn, ob_info->normal, gn); @@ -2088,7 +2088,7 @@ static void lineart_geometry_object_load(LineartObjectInfo *ob_info, vert_settings.min_iter_per_thread = 4000; VertData vert_data; - vert_data.mvert = BKE_mesh_vertices(me); + vert_data.mvert = BKE_mesh_verts(me); vert_data.v_arr = la_v_arr; vert_data.model_view = ob_info->model_view; vert_data.model_view_proj = ob_info->model_view_proj; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 72d77cc7857..8e3058b884d 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -467,7 +467,7 @@ GPU_PBVH_Buffers *GPU_pbvh_mesh_buffers_build(const Mesh *mesh, int i, tottri; int tot_real_edges = 0; - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); buffers = MEM_callocN(sizeof(GPU_PBVH_Buffers), "GPU_Buffers"); diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc index b06b973f764..4f09aee3ea9 100644 --- a/source/blender/io/alembic/exporter/abc_writer_hair.cc +++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc @@ -122,7 +122,7 @@ void ABCHairWriter::write_hair_sample(const HierarchyContext &context, MTFace *mtface = (MTFace *)CustomData_get_layer(&mesh->fdata, CD_MTFACE); MFace *mface = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); - const MVert *mverts = BKE_mesh_vertices(mesh); + const MVert *mverts = BKE_mesh_verts(mesh); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh); if ((!mtface || !mface) && !uv_warning_shown_) { @@ -245,7 +245,7 @@ void ABCHairWriter::write_hair_child_sample(const HierarchyContext &context, MFace *mface = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); MTFace *mtface = (MTFace *)CustomData_get_layer(&mesh->fdata, CD_MTFACE); - const MVert *mverts = BKE_mesh_vertices(mesh); + const MVert *mverts = BKE_mesh_verts(mesh); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh); ParticleSystem *psys = context.particle_system; diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index acfa4c1ea08..52c11d32933 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -176,7 +176,7 @@ void ABCGenericMeshWriter::do_write(HierarchyContext &context) m_custom_data_config.pack_uvs = args_.export_params->packuv; m_custom_data_config.mesh = mesh; - m_custom_data_config.mpoly = mesh->polygons_for_write().data(); + m_custom_data_config.mpoly = mesh->polys_for_write().data(); m_custom_data_config.mloop = mesh->loops_for_write().data(); m_custom_data_config.totpoly = mesh->totpoly; m_custom_data_config.totloop = mesh->totloop; @@ -436,7 +436,7 @@ static void get_vertices(struct Mesh *mesh, std::vector<Imath::V3f> &points) points.clear(); points.resize(mesh->totvert); - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); for (int i = 0, e = mesh->totvert; i < e; i++) { copy_yup_from_zup(points[i].getValue(), verts[i].co); } @@ -447,7 +447,7 @@ static void get_topology(struct Mesh *mesh, std::vector<int32_t> &loop_counts, bool &r_has_flat_shaded_poly) { - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); r_has_flat_shaded_poly = false; @@ -541,7 +541,7 @@ static void get_loop_normals(struct Mesh *mesh, /* NOTE: data needs to be written in the reverse order. */ int abc_index = 0; - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); for (const int i : polys.index_range()) { const MPoly *mp = &polys[i]; diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index cb87ee78fcd..c80d580eb32 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -157,7 +157,7 @@ static void read_mverts(CDStreamConfig &config, const AbcMeshData &mesh_data) void read_mverts(Mesh &mesh, const P3fArraySamplePtr positions, const N3fArraySamplePtr normals) { - MutableSpan<MVert> verts = mesh.vertices_for_write(); + MutableSpan<MVert> verts = mesh.verts_for_write(); for (int i = 0; i < positions->size(); i++) { MVert &mvert = verts[i]; Imath::V3f pos_in = (*positions)[i]; @@ -275,7 +275,7 @@ static void process_loop_normals(CDStreamConfig &config, const N3fArraySamplePtr float(*lnors)[3] = static_cast<float(*)[3]>( MEM_malloc_arrayN(loop_count, sizeof(float[3]), "ABC::FaceNormals")); - MPoly *mpoly = mesh->polygons_for_write().data(); + MPoly *mpoly = mesh->polys_for_write().data(); const N3fArraySample &loop_normals = *loop_normals_ptr; int abc_index = 0; for (int i = 0, e = mesh->totpoly; i < e; i++, mpoly++) { @@ -521,9 +521,9 @@ CDStreamConfig get_config(Mesh *mesh, const bool use_vertex_interpolation) { CDStreamConfig config; config.mesh = mesh; - config.mvert = mesh->vertices_for_write().data(); + config.mvert = mesh->verts_for_write().data(); config.mloop = mesh->loops_for_write().data(); - config.mpoly = mesh->polygons_for_write().data(); + config.mpoly = mesh->polys_for_write().data(); config.totvert = mesh->totvert; config.totloop = mesh->totloop; config.totpoly = mesh->totpoly; diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index f8123432f4e..3728bbd34c3 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -119,7 +119,7 @@ void GeometryExporter::operator()(Object *ob) if (this->export_settings.get_include_shapekeys()) { Key *key = BKE_key_from_object(ob); if (key) { - blender::MutableSpan<MVert> verts = me->vertices_for_write(); + blender::MutableSpan<MVert> verts = me->verts_for_write(); KeyBlock *kb = (KeyBlock *)key->block.first; /* skip the basis */ kb = kb->next; @@ -287,7 +287,7 @@ static bool collect_vertex_counts_per_poly(Mesh *me, int material_index, std::vector<unsigned long> &vcount_list) { - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const blender::bke::AttributeAccessor attributes = blender::bke::mesh_attributes(*me); const blender::VArray<int> material_indices = attributes.lookup_or_default<int>( "material_index", ATTR_DOMAIN_FACE, 0); @@ -322,7 +322,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, std::string &geom_id, std::vector<BCPolygonNormalsIndices> &norind) { - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); std::vector<unsigned long> vcount_list; @@ -434,7 +434,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, void GeometryExporter::createVertsSource(std::string geom_id, Mesh *me) { - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); COLLADASW::FloatSourceF source(mSW); source.setId(getIdBySemantics(geom_id, COLLADASW::InputSemantic::POSITION)); @@ -500,7 +500,7 @@ void GeometryExporter::createVertexColorSource(std::string geom_id, Mesh *me) source.prepareToAppendValues(); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); for (const int i : polys.index_range()) { const MPoly &poly = polys[i]; const MLoopCol *mlc = mloopcol + poly.loopstart; @@ -530,7 +530,7 @@ std::string GeometryExporter::makeTexcoordSourceId(std::string &geom_id, void GeometryExporter::createTexcoordsSource(std::string geom_id, Mesh *me) { int totuv = me->totloop; - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV); @@ -615,9 +615,9 @@ void GeometryExporter::create_normals(std::vector<Normal> &normals, std::map<Normal, unsigned int> shared_normal_indices; int last_normal_index = -1; - const Span<MVert> verts = me->vertices(); + const Span<MVert> verts = me->verts(); const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(me); - const Span<MPoly> polys = me->polygons(); + const Span<MPoly> polys = me->polys(); const Span<MLoop> loops = me->loops(); const float(*lnors)[3] = nullptr; bool use_custom_normals = false; diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 8aa1685030f..e7a4f7b6b51 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -344,7 +344,7 @@ void MeshImporter::read_vertices(COLLADAFW::Mesh *mesh, Mesh *me) me->totvert = pos.getFloatValues()->getCount() / stride; CustomData_add_layer(&me->vdata, CD_MVERT, CD_SET_DEFAULT, nullptr, me->totvert); - MutableSpan<MVert> verts = me->vertices_for_write(); + MutableSpan<MVert> verts = me->verts_for_write(); for (const int i : verts.index_range()) { get_vector(verts[i].co, pos, i, stride); } @@ -607,7 +607,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh, Mesh *me) UVDataWrapper uvs(collada_mesh->getUVCoords()); VCOLDataWrapper vcol(collada_mesh->getColors()); - MutableSpan<MPoly> polys = me->polygons_for_write(); + MutableSpan<MPoly> polys = me->polys_for_write(); MutableSpan<MLoop> loops = me->loops_for_write(); MPoly *mpoly = polys.data(); MLoop *mloop = loops.data(); diff --git a/source/blender/io/stl/importer/stl_import_mesh.cc b/source/blender/io/stl/importer/stl_import_mesh.cc index d85185ede6e..de993cd2f27 100644 --- a/source/blender/io/stl/importer/stl_import_mesh.cc +++ b/source/blender/io/stl/importer/stl_import_mesh.cc @@ -77,7 +77,7 @@ Mesh *STLMeshHelper::to_mesh(Main *bmain, char *mesh_name) mesh->totvert = verts_.size(); CustomData_add_layer(&mesh->vdata, CD_MVERT, CD_SET_DEFAULT, nullptr, mesh->totvert); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); for (int i = 0; i < mesh->totvert; i++) { copy_v3_v3(verts[i].co, verts_[i]); } @@ -86,7 +86,7 @@ Mesh *STLMeshHelper::to_mesh(Main *bmain, char *mesh_name) mesh->totloop = tris_.size() * 3; CustomData_add_layer(&mesh->pdata, CD_MPOLY, CD_SET_DEFAULT, nullptr, mesh->totpoly); CustomData_add_layer(&mesh->ldata, CD_MLOOP, CD_SET_DEFAULT, nullptr, mesh->totloop); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); threading::parallel_for(tris_.index_range(), 2048, [&](IndexRange tris_range) { for (const int i : tris_range) { diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index cde7ab5b628..259b52ed435 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -312,7 +312,7 @@ bool USDMeshReader::topology_changed(const Mesh *existing_mesh, const double mot void USDMeshReader::read_mpolys(Mesh *mesh) { - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); int loop_index = 0; @@ -516,7 +516,7 @@ void USDMeshReader::read_colors(Mesh *mesh, const double motionSampleTime) MLoopCol *colors = static_cast<MLoopCol *>(cd_ptr); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); for (const int i : polys.index_range()) { const MPoly &poly = polys[i]; @@ -630,7 +630,7 @@ void USDMeshReader::process_normals_face_varying(Mesh *mesh) float(*lnors)[3] = static_cast<float(*)[3]>( MEM_malloc_arrayN(loop_count, sizeof(float[3]), "USD::FaceNormals")); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); for (const int i : polys.index_range()) { const MPoly &poly = polys[i]; for (int j = 0; j < poly.totloop; j++) { @@ -671,7 +671,7 @@ void USDMeshReader::process_normals_uniform(Mesh *mesh) float(*lnors)[3] = static_cast<float(*)[3]>( MEM_malloc_arrayN(mesh->totloop, sizeof(float[3]), "USD::FaceNormals")); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); for (const int i : polys.index_range()) { const MPoly &poly = polys[i]; for (int j = 0; j < poly.totloop; j++) { @@ -698,7 +698,7 @@ void USDMeshReader::read_mesh_sample(ImportSettings *settings, * in code that expect this data to be there. */ if (new_mesh || (settings->read_flag & MOD_MESHSEQ_READ_VERT) != 0) { - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); for (int i = 0; i < positions_.size(); i++) { MVert &mvert = verts[i]; mvert.co[0] = positions_[i][0]; @@ -913,7 +913,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh, /* Here we assume that the number of materials doesn't change, i.e. that * the material slots that were created when the object was loaded from * USD are still valid now. */ - MutableSpan<MPoly> polys = active_mesh->polygons_for_write(); + MutableSpan<MPoly> polys = active_mesh->polys_for_write(); if (!polys.is_empty() && import_params_.import_materials) { std::map<pxr::SdfPath, int> mat_map; bke::MutableAttributeAccessor attributes = bke::mesh_attributes_for_write(*active_mesh); diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index f6250eebd5d..9f8e38c4dfd 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -246,7 +246,7 @@ static void get_vertices(const Mesh *mesh, USDMeshData &usd_mesh_data) { usd_mesh_data.points.reserve(mesh->totvert); - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); for (const int i : verts.index_range()) { usd_mesh_data.points.push_back(pxr::GfVec3f(verts[i].co)); } @@ -269,7 +269,7 @@ static void get_loops_polys(const Mesh *mesh, USDMeshData &usd_mesh_data) usd_mesh_data.face_vertex_counts.reserve(mesh->totpoly); usd_mesh_data.face_indices.reserve(mesh->totloop); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); for (const int i : polys.index_range()) { @@ -399,7 +399,7 @@ void USDGenericMeshWriter::write_normals(const Mesh *mesh, pxr::UsdGeomMesh usd_ { pxr::UsdTimeCode timecode = get_export_time_code(); const float(*lnors)[3] = static_cast<float(*)[3]>(CustomData_get_layer(&mesh->ldata, CD_NORMAL)); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); pxr::VtVec3fArray loop_normals; diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index 272afe4a843..cd724152b05 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -189,7 +189,7 @@ void OBJMesh::ensure_mesh_edges() const void OBJMesh::calc_smooth_groups(const bool use_bitflags) { const Span<MEdge> edges = export_mesh_eval_->edges(); - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const Span<MLoop> loops = export_mesh_eval_->loops(); poly_smooth_groups_ = BKE_mesh_calc_smoothgroups(edges.data(), edges.size(), @@ -242,7 +242,7 @@ const Material *OBJMesh::get_object_material(const int16_t mat_nr) const bool OBJMesh::is_ith_poly_smooth(const int poly_index) const { - const Span<MPoly> polygons = export_mesh_eval_->polygons(); + const Span<MPoly> polygons = export_mesh_eval_->polys(); return polygons[poly_index].flag & ME_SMOOTH; } @@ -268,7 +268,7 @@ const char *OBJMesh::get_object_material_name(const int16_t mat_nr) const float3 OBJMesh::calc_vertex_coords(const int vert_index, const float scaling_factor) const { float3 r_coords; - const Span<MVert> verts = export_mesh_eval_->vertices(); + const Span<MVert> verts = export_mesh_eval_->verts(); copy_v3_v3(r_coords, verts[vert_index].co); mul_m4_v3(world_and_axes_transform_, r_coords); mul_v3_fl(r_coords, scaling_factor); @@ -277,7 +277,7 @@ float3 OBJMesh::calc_vertex_coords(const int vert_index, const float scaling_fac Vector<int> OBJMesh::calc_poly_vertex_indices(const int poly_index) const { - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const Span<MLoop> loops = export_mesh_eval_->loops(); const MPoly &mpoly = polys[poly_index]; const MLoop *mloop = &loops[mpoly.loopstart]; @@ -291,7 +291,7 @@ Vector<int> OBJMesh::calc_poly_vertex_indices(const int poly_index) const void OBJMesh::store_uv_coords_and_indices() { - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const Span<MLoop> loops = export_mesh_eval_->loops(); const int totvert = export_mesh_eval_->totvert; const MLoopUV *mloopuv = static_cast<const MLoopUV *>( @@ -347,8 +347,8 @@ Span<int> OBJMesh::calc_poly_uv_indices(const int poly_index) const float3 OBJMesh::calc_poly_normal(const int poly_index) const { float3 r_poly_normal; - const Span<MVert> verts = export_mesh_eval_->vertices(); - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MVert> verts = export_mesh_eval_->verts(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const Span<MLoop> loops = export_mesh_eval_->loops(); const MPoly &poly = polys[poly_index]; BKE_mesh_calc_poly_normal(&poly, &loops[poly.loopstart], verts.data(), r_poly_normal); @@ -375,7 +375,7 @@ static float3 round_float3_to_n_digits(const float3 &v, int round_digits) void OBJMesh::store_normal_coords_and_indices() { - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); /* We'll round normal components to 4 digits. * This will cover up some minor differences @@ -436,7 +436,7 @@ Vector<int> OBJMesh::calc_poly_normal_indices(const int poly_index) const if (loop_to_normal_index_.is_empty()) { return {}; } - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const MPoly &mpoly = polys[poly_index]; const int totloop = mpoly.totloop; Vector<int> r_poly_normal_indices(totloop); @@ -460,7 +460,7 @@ int16_t OBJMesh::get_poly_deform_group_index(const int poly_index, { BLI_assert(poly_index < export_mesh_eval_->totpoly); BLI_assert(group_weights.size() == BKE_object_defgroup_count(&export_object_eval_)); - const Span<MPoly> polys = export_mesh_eval_->polygons(); + const Span<MPoly> polys = export_mesh_eval_->polys(); const Span<MLoop> loops = export_mesh_eval_->loops(); const Span<MDeformVert> dverts = export_mesh_eval_->deform_verts(); if (dverts.is_empty()) { diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc index 4b4609c053b..84f1c6dd6b0 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc @@ -158,7 +158,7 @@ void MeshFromGeometry::fixup_invalid_faces() void MeshFromGeometry::create_vertices(Mesh *mesh) { - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); /* Go through all the global vertex indices from min to max, * checking which ones are actually and building a global->local * index mapping. Write out the used vertex positions into the Mesh @@ -185,7 +185,7 @@ void MeshFromGeometry::create_polys_loops(Mesh *mesh, bool use_vertex_groups) dverts = mesh->deform_verts_for_write(); } - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); bke::SpanAttributeWriter<int> material_indices = bke::mesh_attributes_for_write(*mesh).lookup_or_add_for_write_only_span<int>( diff --git a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc index 669a7ba80cf..99e12aed99c 100644 --- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc +++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc @@ -96,7 +96,7 @@ class obj_importer_test : public BlendfileLoadingBaseTest { EXPECT_EQ(mesh->totedge, exp.mesh_totedge_or_curve_endp); EXPECT_EQ(mesh->totpoly, exp.mesh_totpoly_or_curve_order); EXPECT_EQ(mesh->totloop, exp.mesh_totloop_or_curve_cyclic); - const Span<MVert> verts = mesh->vertices(); + const Span<MVert> verts = mesh->verts(); EXPECT_V3_NEAR(verts.first().co, exp.vert_first, 0.0001f); EXPECT_V3_NEAR(verts.last().co, exp.vert_last, 0.0001f); const float3 *lnors = (const float3 *)(CustomData_get_layer(&mesh->ldata, CD_NORMAL)); diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 6b48f1e029f..f14ec52decc 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -321,9 +321,9 @@ typedef struct Mesh { * Array of vertex positions (and various other data). Edges and faces are defined by indices * into this array. */ - blender::Span<MVert> vertices() const; + blender::Span<MVert> verts() const; /** Write access to vertex data. */ - blender::MutableSpan<MVert> vertices_for_write(); + blender::MutableSpan<MVert> verts_for_write(); /** * Array of edges, containing vertex indices. For simple triangle or quad meshes, edges could be * calculated from the #MPoly and #MLoop arrays, however, edges need to be stored explicitly to @@ -335,9 +335,9 @@ typedef struct Mesh { /** * Face topology storage of the size and offset of each face's section of the face corners. */ - blender::Span<MPoly> polygons() const; + blender::Span<MPoly> polys() const; /** Write access to polygon data. */ - blender::MutableSpan<MPoly> polygons_for_write(); + blender::MutableSpan<MPoly> polys_for_write(); /** * Mesh face corners that "loop" around each face, storing the vertex index and the index of the * subsequent edge. diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index f63d91d5943..c36e53a49cd 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -348,7 +348,7 @@ static int rna_MeshVertex_index_get(PointerRNA *ptr) { const Mesh *mesh = rna_mesh(ptr); const MVert *vert = (MVert *)ptr->data; - const int index = (int)(vert - BKE_mesh_vertices(mesh)); + const int index = (int)(vert - BKE_mesh_verts(mesh)); BLI_assert(index >= 0); BLI_assert(index < mesh->totvert); return index; @@ -368,7 +368,7 @@ static int rna_MeshPolygon_index_get(PointerRNA *ptr) { const Mesh *mesh = rna_mesh(ptr); const MPoly *mpoly = (MPoly *)ptr->data; - const int index = (int)(mpoly - BKE_mesh_polygons(mesh)); + const int index = (int)(mpoly - BKE_mesh_polys(mesh)); BLI_assert(index >= 0); BLI_assert(index < mesh->totpoly); return index; @@ -532,7 +532,7 @@ static void rna_MeshPolygon_normal_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); BKE_mesh_calc_poly_normal(mp, loops + mp->loopstart, verts, values); } @@ -583,7 +583,7 @@ static void rna_MeshPolygon_center_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); BKE_mesh_calc_poly_center(mp, loops + mp->loopstart, verts, values); } @@ -592,7 +592,7 @@ static float rna_MeshPolygon_area_get(PointerRNA *ptr) { Mesh *me = (Mesh *)ptr->owner_id; MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); return BKE_mesh_calc_poly_area(mp, loops + mp->loopstart, verts); } @@ -621,7 +621,7 @@ static void rna_MeshLoopTriangle_normal_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MLoopTri *lt = (MLoopTri *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); unsigned int v1 = loops[lt->tri[0]].v; unsigned int v2 = loops[lt->tri[1]].v; @@ -652,7 +652,7 @@ static float rna_MeshLoopTriangle_area_get(PointerRNA *ptr) { Mesh *me = rna_mesh(ptr); MLoopTri *lt = (MLoopTri *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); unsigned int v1 = loops[lt->tri[0]].v; unsigned int v2 = loops[lt->tri[1]].v; @@ -1335,7 +1335,7 @@ static bool rna_MeshLoopTriangle_use_smooth_get(PointerRNA *ptr) { const Mesh *me = rna_mesh(ptr); const MLoopTri *ltri = (MLoopTri *)ptr->data; - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); return polys[ltri->poly].flag & ME_SMOOTH; } @@ -1452,7 +1452,7 @@ static void rna_Mesh_vertices_begin(CollectionPropertyIterator *iter, PointerRNA { Mesh *mesh = rna_mesh(ptr); rna_iterator_array_begin( - iter, BKE_mesh_vertices_for_write(mesh), sizeof(MVert), mesh->totvert, false, NULL); + iter, BKE_mesh_verts_for_write(mesh), sizeof(MVert), mesh->totvert, false, NULL); } static int rna_Mesh_vertices_length(PointerRNA *ptr) { @@ -1467,7 +1467,7 @@ int rna_Mesh_vertices_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr) } r_ptr->owner_id = &mesh->id; r_ptr->type = &RNA_MeshVertex; - r_ptr->data = &BKE_mesh_vertices_for_write(mesh)[index]; + r_ptr->data = &BKE_mesh_verts_for_write(mesh)[index]; return true; } @@ -1498,7 +1498,7 @@ static void rna_Mesh_polygons_begin(CollectionPropertyIterator *iter, PointerRNA { Mesh *mesh = rna_mesh(ptr); rna_iterator_array_begin( - iter, BKE_mesh_polygons_for_write(mesh), sizeof(MPoly), mesh->totpoly, false, NULL); + iter, BKE_mesh_polys_for_write(mesh), sizeof(MPoly), mesh->totpoly, false, NULL); } static int rna_Mesh_polygons_length(PointerRNA *ptr) { @@ -1513,7 +1513,7 @@ int rna_Mesh_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr) } r_ptr->owner_id = &mesh->id; r_ptr->type = &RNA_MeshPolygon; - r_ptr->data = &BKE_mesh_polygons_for_write(mesh)[index]; + r_ptr->data = &BKE_mesh_polys_for_write(mesh)[index]; return true; } diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 4c0707ba186..3635759ad4d 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -92,7 +92,7 @@ static void rna_Mesh_calc_smooth_groups( *r_poly_group_len = mesh->totpoly; *r_poly_group = BKE_mesh_calc_smoothgroups(BKE_mesh_edges(mesh), mesh->totedge, - BKE_mesh_polygons(mesh), + BKE_mesh_polys(mesh), mesh->totpoly, BKE_mesh_loops(mesh), mesh->totloop, @@ -166,7 +166,7 @@ static void rna_Mesh_transform(Mesh *mesh, float mat[16], bool shape_keys) static void rna_Mesh_flip_normals(Mesh *mesh) { BKE_mesh_polygons_flip( - BKE_mesh_polygons(mesh), BKE_mesh_loops_for_write(mesh), &mesh->ldata, mesh->totpoly); + BKE_mesh_polys(mesh), BKE_mesh_loops_for_write(mesh), &mesh->ldata, mesh->totpoly); BKE_mesh_tessface_clear(mesh); BKE_mesh_normals_tag_dirty(mesh); BKE_mesh_runtime_clear_geometry(mesh); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index d9ef30d6f7f..cd2434ff5be 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -212,7 +212,7 @@ static void rna_ParticleHairKey_location_object_get(PointerRNA *ptr, float *valu if (pa) { Mesh *hair_mesh = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_mesh : NULL; - const MVert *vertices = BKE_mesh_vertices(hair_mesh); + const MVert *vertices = BKE_mesh_verts(hair_mesh); if (hair_mesh) { const MVert *mvert = &vertices[pa->hair_index + (hkey - pa->hair)]; copy_v3_v3(values, mvert->co); @@ -279,7 +279,7 @@ static void hair_key_location_object_set(HairKey *hair_key, if (hair_key_index == -1) { return; } - MVert *vertices = BKE_mesh_vertices_for_write(hair_mesh); + MVert *vertices = BKE_mesh_verts_for_write(hair_mesh); MVert *mvert = &vertices[particle->hair_index + (hair_key_index)]; copy_v3_v3(mvert->co, src_co); return; @@ -324,7 +324,7 @@ static void rna_ParticleHairKey_co_object(HairKey *hairkey, NULL; if (particle) { if (hair_mesh) { - const MVert *vertices = BKE_mesh_vertices(hair_mesh); + const MVert *vertices = BKE_mesh_verts(hair_mesh); const MVert *mvert = &vertices[particle->hair_index + (hairkey - particle->hair)]; copy_v3_v3(n_co, mvert->co); } diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 3bba1ac07a6..42fe0107217 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -279,9 +279,9 @@ static void mesh_merge_transform(Mesh *result, MEdge *me; MLoop *ml; MPoly *mp; - MVert *result_verts = BKE_mesh_vertices_for_write(result); + MVert *result_verts = BKE_mesh_verts_for_write(result); MEdge *result_edges = BKE_mesh_edges_for_write(result); - MPoly *result_polys = BKE_mesh_polygons_for_write(result); + MPoly *result_polys = BKE_mesh_polys_for_write(result); MLoop *result_loops = BKE_mesh_loops_for_write(result); CustomData_copy_data(&cap_mesh->vdata, &result->vdata, 0, cap_verts_index, cap_nverts); @@ -430,9 +430,9 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, /* Build up offset array, accumulating all settings options. */ unit_m4(offset); - const MVert *src_verts = BKE_mesh_vertices(mesh); + const MVert *src_verts = BKE_mesh_verts(mesh); const MEdge *src_edges = BKE_mesh_edges(mesh); - const MPoly *src_polys = BKE_mesh_polygons(mesh); + const MPoly *src_polys = BKE_mesh_polys(mesh); const MLoop *src_loops = BKE_mesh_loops(mesh); if (amd->offset_type & MOD_ARR_OFF_CONST) { @@ -543,9 +543,9 @@ static Mesh *arrayModifier_doArray(ArrayModifierData *amd, /* Initialize a result dm */ result = BKE_mesh_new_nomain_from_template( mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys); - MVert *result_verts = BKE_mesh_vertices_for_write(result); + MVert *result_verts = BKE_mesh_verts_for_write(result); MEdge *result_edges = BKE_mesh_edges_for_write(result); - MPoly *result_polys = BKE_mesh_polygons_for_write(result); + MPoly *result_polys = BKE_mesh_polys_for_write(result); MLoop *result_loops = BKE_mesh_loops_for_write(result); if (use_merge) { diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 39667a3f1d5..b266e71e99a 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -144,7 +144,7 @@ static Mesh *get_quick_mesh( invert_m4_m4(imat, ob_self->obmat); mul_m4_m4m4(omat, imat, ob_operand_ob->obmat); - MutableSpan<MVert> verts = result->vertices_for_write(); + MutableSpan<MVert> verts = result->verts_for_write(); for (const int i : verts.index_range()) { mul_m4_v3(omat, verts[i].co); } diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 02d56560fc5..78724d6a2a1 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -75,9 +75,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct const int vert_src_num = mesh->totvert; const int edge_src_num = mesh->totedge; const int poly_src_num = mesh->totpoly; - const MVert *mvert_src = BKE_mesh_vertices(mesh); + const MVert *mvert_src = BKE_mesh_verts(mesh); const MEdge *medge_src = BKE_mesh_edges(mesh); - const MPoly *mpoly_src = BKE_mesh_polygons(mesh); + const MPoly *mpoly_src = BKE_mesh_polys(mesh); const MLoop *mloop_src = BKE_mesh_loops(mesh); vertMap = MEM_malloc_arrayN(vert_src_num, sizeof(*vertMap), "build modifier vertMap"); @@ -202,9 +202,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct /* now we know the number of verts, edges and faces, we can create the mesh. */ result = BKE_mesh_new_nomain_from_template( mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash), 0, loops_dst_num, faces_dst_num); - MVert *result_verts = BKE_mesh_vertices_for_write(result); + MVert *result_verts = BKE_mesh_verts_for_write(result); MEdge *result_edges = BKE_mesh_edges_for_write(result); - MPoly *result_polys = BKE_mesh_polygons_for_write(result); + MPoly *result_polys = BKE_mesh_polys_for_write(result); MLoop *result_loops = BKE_mesh_loops_for_write(result); /* copy the vertices across */ diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 3ae83cb2244..e38bf96500e 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -145,7 +145,7 @@ static void deformVerts(ModifierData *md, if (collmd->time_xnew == -1000) { /* first time */ - collmd->x = MEM_dupallocN(BKE_mesh_vertices(mesh_src)); /* frame start position */ + collmd->x = MEM_dupallocN(BKE_mesh_verts(mesh_src)); /* frame start position */ for (uint i = 0; i < mvert_num; i++) { /* we save global positions */ @@ -182,7 +182,7 @@ static void deformVerts(ModifierData *md, collmd->xnew = tempVert; collmd->time_x = collmd->time_xnew; - memcpy(collmd->xnew, BKE_mesh_vertices(mesh_src), mvert_num * sizeof(MVert)); + memcpy(collmd->xnew, BKE_mesh_verts(mesh_src), mvert_num * sizeof(MVert)); bool is_static = true; diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index 30afb993cc7..16f2205796c 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -132,7 +132,7 @@ static void mesh_get_weights(const MDeformVert *dvert, static void mesh_get_boundaries(Mesh *mesh, float *smooth_weights) { const MEdge *medge = BKE_mesh_edges(mesh); - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); uint mpoly_num, medge_num, i; ushort *boundaries; @@ -452,7 +452,7 @@ static void calc_tangent_spaces(Mesh *mesh, float (*vertexCos)[3], float (*r_tan #ifndef USE_TANGENT_CALC_INLINE const uint mvert_num = (uint)dm->getNumVerts(dm); #endif - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); uint i; diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 729a912b079..2d917310818 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -179,9 +179,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * BLI_SPACE_TRANSFORM_SETUP(space_transform, ctx->object, ob_source); } - const MVert *me_verts = BKE_mesh_vertices(me); + const MVert *me_verts = BKE_mesh_verts(me); const MEdge *me_edges = BKE_mesh_edges(me); - const MVert *result_verts = BKE_mesh_vertices(result); + const MVert *result_verts = BKE_mesh_verts(result); const MEdge *result_edges = BKE_mesh_edges(result); if (((result == me) || (me_verts == result_verts) || (me_edges == result_edges)) && diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index 00a6cb5878f..ddaea289246 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -286,7 +286,7 @@ static void displaceModifier_do(DisplaceModifierData *dmd, return; } - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); MOD_get_vgroup(ob, mesh, dmd->defgrp_name, &dvert, &defgrp_index); if (defgrp_index >= 0 && dvert == NULL) { diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index e5579819cf0..c8f1ef73d5e 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -100,7 +100,7 @@ static void createFacepa(ExplodeModifierData *emd, ParticleSystemModifierData *p int i, p, v1, v2, v3, v4 = 0; const bool invert_vgroup = (emd->flag & eExplodeFlag_INVERT_VGROUP) != 0; - mvert = BKE_mesh_vertices_for_write(mesh); + mvert = BKE_mesh_verts_for_write(mesh); mface = (MFace *)CustomData_get_layer(&mesh->fdata, CD_MFACE); totvert = mesh->totvert; totface = mesh->totface; @@ -730,8 +730,8 @@ static Mesh *cutEdges(ExplodeModifierData *emd, Mesh *mesh) layers_num = CustomData_number_of_layers(&split_m->fdata, CD_MTFACE); - const MVert *mesh_verts = BKE_mesh_vertices(mesh); - MVert *split_m_verts = BKE_mesh_vertices_for_write(split_m); + const MVert *mesh_verts = BKE_mesh_verts(mesh); + MVert *split_m_verts = BKE_mesh_verts_for_write(split_m); /* copy new faces & verts (is it really this painful with custom data??) */ for (i = 0; i < totvert; i++) { @@ -989,8 +989,8 @@ static Mesh *explodeMesh(ExplodeModifierData *emd, psmd->psys->lattice_deform_data = psys_create_lattice_deform_data(&sim); - const MVert *mesh_verts = BKE_mesh_vertices(mesh); - MVert *explode_verts = BKE_mesh_vertices_for_write(explode); + const MVert *mesh_verts = BKE_mesh_verts(mesh); + MVert *explode_verts = BKE_mesh_verts_for_write(explode); /* duplicate & displace vertices */ ehi = BLI_edgehashIterator_new(vertpahash); diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index d74c1e7ac2d..13193d7eb11 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -388,7 +388,7 @@ static void laplaciansmoothModifier_do( return; } - sys->mpoly = BKE_mesh_polygons(mesh); + sys->mpoly = BKE_mesh_polys(mesh); sys->mloop = BKE_mesh_loops(mesh); sys->medges = BKE_mesh_edges(mesh); sys->vertexCos = vertexCos; diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index cfa0299da66..e0428042caa 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -231,7 +231,7 @@ static void computed_masked_polygons(const Mesh *mesh, uint *r_loops_masked_num) { BLI_assert(mesh->totvert == vertex_mask.size()); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); r_masked_poly_indices.reserve(mesh->totpoly); @@ -277,7 +277,7 @@ static void compute_interpolated_polygons(const Mesh *mesh, /* NOTE: this reserve can only lift the capacity if there are ngons, which get split. */ r_masked_poly_indices.reserve(r_masked_poly_indices.size() + verts_add_num); r_loop_starts.reserve(r_loop_starts.size() + verts_add_num); - const Span<MPoly> polys = mesh->polygons(); + const Span<MPoly> polys = mesh->polys(); const Span<MLoop> loops = mesh->loops(); uint edges_add_num = 0; @@ -338,8 +338,8 @@ static void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh, Span<int> vertex_map) { BLI_assert(src_mesh.totvert == vertex_map.size()); - const Span<MVert> src_verts = src_mesh.vertices(); - MutableSpan<MVert> dst_verts = dst_mesh.vertices_for_write(); + const Span<MVert> src_verts = src_mesh.verts(); + MutableSpan<MVert> dst_verts = dst_mesh.verts_for_write(); for (const int i_src : vertex_map.index_range()) { const int i_dst = vertex_map[i_src]; @@ -378,9 +378,9 @@ static void add_interp_verts_copy_edges_to_new_mesh(const Mesh &src_mesh, { BLI_assert(src_mesh.totvert == vertex_mask.size()); BLI_assert(src_mesh.totedge == r_edge_map.size()); - const Span<MVert> src_verts = src_mesh.vertices(); + const Span<MVert> src_verts = src_mesh.verts(); const Span<MEdge> src_edges = src_mesh.edges(); - MutableSpan<MVert> dst_verts = dst_mesh.vertices_for_write(); + MutableSpan<MVert> dst_verts = dst_mesh.verts_for_write(); MutableSpan<MEdge> dst_edges = dst_mesh.edges_for_write(); uint vert_index = dst_mesh.totvert - verts_add_num; @@ -466,9 +466,9 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh, Span<int> new_loop_starts, int polys_masked_num) { - const Span<MPoly> src_polys = src_mesh.polygons(); + const Span<MPoly> src_polys = src_mesh.polys(); const Span<MLoop> src_loops = src_mesh.loops(); - MutableSpan<MPoly> dst_polys = dst_mesh.polygons_for_write(); + MutableSpan<MPoly> dst_polys = dst_mesh.polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh.loops_for_write(); for (const int i_dst : IndexRange(polys_masked_num)) { @@ -507,10 +507,10 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh, int polys_masked_num, int edges_add_num) { - const Span<MPoly> src_polys = src_mesh.polygons(); + const Span<MPoly> src_polys = src_mesh.polys(); const Span<MLoop> src_loops = src_mesh.loops(); MutableSpan<MEdge> dst_edges = dst_mesh.edges_for_write(); - MutableSpan<MPoly> dst_polys = dst_mesh.polygons_for_write(); + MutableSpan<MPoly> dst_polys = dst_mesh.polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh.loops_for_write(); int edge_index = dst_mesh.totedge - edges_add_num; diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index 162ff3fe4ff..822da40edb7 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -182,14 +182,14 @@ static void meshcache_do(MeshCacheModifierData *mcmd, float(*vertexCos_Source)[3] = MEM_malloc_arrayN( verts_num, sizeof(*vertexCos_Source), __func__); float(*vertexCos_New)[3] = MEM_malloc_arrayN(verts_num, sizeof(*vertexCos_New), __func__); - const MVert *mv = BKE_mesh_vertices(me); + const MVert *mv = BKE_mesh_verts(me); for (i = 0; i < verts_num; i++, mv++) { copy_v3_v3(vertexCos_Source[i], mv->co); } BKE_mesh_calc_relative_deform( - BKE_mesh_polygons(me), + BKE_mesh_polys(me), me->totpoly, BKE_mesh_loops(me), me->totvert, diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index bdaa90af5d8..1a41fa4cd3b 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -178,12 +178,12 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * } if (me != nullptr) { - const Span<MVert> mesh_verts = mesh->vertices(); + const Span<MVert> mesh_verts = mesh->verts(); const Span<MEdge> mesh_edges = mesh->edges(); - const Span<MPoly> mesh_polys = mesh->polygons(); - const Span<MVert> me_vertices = me->vertices(); + const Span<MPoly> mesh_polys = mesh->polys(); + const Span<MVert> me_vertices = me->verts(); const Span<MEdge> me_edges = me->edges(); - const Span<MPoly> me_polygons = me->polygons(); + const Span<MPoly> me_polygons = me->polys(); /* TODO(sybren+bastien): possibly check relevant custom data layers (UV/color depending on * flags) and duplicate those too. diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index 41d6e339999..6e94acaa9eb 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -53,7 +53,7 @@ static void generate_vert_coordinates(Mesh *mesh, INIT_MINMAX(min_co, max_co); - const MVert *mv = BKE_mesh_vertices(mesh); + const MVert *mv = BKE_mesh_verts(mesh); for (int i = 0; i < mesh->totvert; i++, mv++) { copy_v3_v3(r_cos[i], mv->co); if (r_size != NULL && ob_center == NULL) { @@ -523,9 +523,9 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd, const int edges_num = result->totedge; const int loops_num = result->totloop; const int polys_num = result->totpoly; - const MVert *verts = BKE_mesh_vertices(result); + const MVert *verts = BKE_mesh_verts(result); MEdge *edges = BKE_mesh_edges_for_write(result); - const MPoly *polys = BKE_mesh_polygons(result); + const MPoly *polys = BKE_mesh_polys(result); MLoop *loops = BKE_mesh_loops_for_write(result); int defgrp_index; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index cca49b42208..9c6f7ff4069 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -273,8 +273,8 @@ static Mesh *generate_ocean_geometry(OceanModifierData *omd, Mesh *mesh_orig, co result = BKE_mesh_new_nomain(verts_num, 0, 0, polys_num * 4, polys_num); BKE_mesh_copy_parameters_for_eval(result, mesh_orig); - gogd.mverts = BKE_mesh_vertices_for_write(result); - gogd.mpolys = BKE_mesh_polygons_for_write(result); + gogd.mverts = BKE_mesh_verts_for_write(result); + gogd.mpolys = BKE_mesh_polys_for_write(result); gogd.mloops = BKE_mesh_loops_for_write(result); TaskParallelSettings settings; @@ -366,8 +366,8 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes CLAMP(cfra_for_cache, omd->bakestart, omd->bakeend); cfra_for_cache -= omd->bakestart; /* shift to 0 based */ - MVert *verts = BKE_mesh_vertices_for_write(result); - MPoly *polys = BKE_mesh_polygons_for_write(result); + MVert *verts = BKE_mesh_verts_for_write(result); + MPoly *polys = BKE_mesh_polys_for_write(result); /* add vcols before displacement - allows lookup based on position */ diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 599c056f27c..6c69e616f83 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -317,12 +317,12 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * result = BKE_mesh_new_nomain_from_template(mesh, maxvert, maxedge, 0, maxloop, maxpoly); - const MVert *orig_mvert = BKE_mesh_vertices(mesh); - const MPoly *orig_mpoly = BKE_mesh_polygons(mesh); + const MVert *orig_mvert = BKE_mesh_verts(mesh); + const MPoly *orig_mpoly = BKE_mesh_polys(mesh); const MLoop *orig_mloop = BKE_mesh_loops(mesh); - MVert *mvert = BKE_mesh_vertices_for_write(result); + MVert *mvert = BKE_mesh_verts_for_write(result); MEdge *edges = BKE_mesh_edges_for_write(result); - MPoly *mpoly = BKE_mesh_polygons_for_write(result); + MPoly *mpoly = BKE_mesh_polys_for_write(result); MLoop *mloop = BKE_mesh_loops_for_write(result); MLoopCol *mloopcols_index = CustomData_get_layer_named( diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 37d711a4bfa..4241ca5a591 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -60,7 +60,7 @@ static void init_dualcon_mesh(DualConInput *input, Mesh *mesh) { memset(input, 0, sizeof(DualConInput)); - input->co = (void *)BKE_mesh_vertices(mesh); + input->co = (void *)BKE_mesh_verts(mesh); input->co_stride = sizeof(MVert); input->totco = mesh->totvert; @@ -96,8 +96,8 @@ static void *dualcon_alloc_output(int totvert, int totquad) } output->mesh = BKE_mesh_new_nomain(totvert, 0, 0, 4 * totquad, totquad); - output->verts = BKE_mesh_vertices_for_write(output->mesh); - output->polys = BKE_mesh_polygons_for_write(output->mesh); + output->verts = BKE_mesh_verts_for_write(output->mesh); + output->polys = BKE_mesh_polys_for_write(output->mesh); output->loops = BKE_mesh_loops_for_write(output->mesh); return output; @@ -200,7 +200,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx) } if (rmd->flag & MOD_REMESH_SMOOTH_SHADING) { - MPoly *mpoly = BKE_mesh_polygons_for_write(result); + MPoly *mpoly = BKE_mesh_polys_for_write(result); int i, totpoly = result->totpoly; /* Apply smooth shading to output faces */ diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index d657d658e46..acaeb9b2777 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -388,14 +388,14 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * result = BKE_mesh_new_nomain_from_template( mesh, (int)maxVerts, (int)maxEdges, 0, (int)maxPolys * 4, (int)maxPolys); - const MVert *mvert_orig = BKE_mesh_vertices(mesh); + const MVert *mvert_orig = BKE_mesh_verts(mesh); const MEdge *medge_orig = BKE_mesh_edges(mesh); - const MPoly *mpoly_orig = BKE_mesh_polygons(mesh); + const MPoly *mpoly_orig = BKE_mesh_polys(mesh); const MLoop *mloop_orig = BKE_mesh_loops(mesh); - MVert *mvert_new = BKE_mesh_vertices_for_write(result); + MVert *mvert_new = BKE_mesh_verts_for_write(result); MEdge *medge_new = BKE_mesh_edges_for_write(result); - MPoly *mpoly_new = BKE_mesh_polygons_for_write(result); + MPoly *mpoly_new = BKE_mesh_polys_for_write(result); MLoop *mloop_new = BKE_mesh_loops_for_write(result); if (!CustomData_has_layer(&result->pdata, CD_ORIGINDEX)) { diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 5b9b496b0d3..ae8fcb42553 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -889,7 +889,7 @@ static Mesh *subdivide_base(const Mesh *orig) float radrat; const MVertSkin *orignode = CustomData_get_layer(&orig->vdata, CD_MVERT_SKIN); - const MVert *origvert = BKE_mesh_vertices(orig); + const MVert *origvert = BKE_mesh_verts(orig); const MEdge *origedge = BKE_mesh_edges(orig); const MDeformVert *origdvert = BKE_mesh_deform_verts(orig); int orig_vert_num = orig->totvert; @@ -916,7 +916,7 @@ static Mesh *subdivide_base(const Mesh *orig) Mesh *result = BKE_mesh_new_nomain_from_template( orig, orig_vert_num + subd_num, orig_edge_num + subd_num, 0, 0, 0); - MVert *outvert = BKE_mesh_vertices_for_write(result); + MVert *outvert = BKE_mesh_verts_for_write(result); MEdge *outedge = BKE_mesh_edges_for_write(result); MVertSkin *outnode = CustomData_get_layer(&result->vdata, CD_MVERT_SKIN); MDeformVert *outdvert = NULL; @@ -1918,7 +1918,7 @@ static Mesh *base_skin(Mesh *origmesh, SkinModifierData *smd, eSkinErrorFlag *r_ nodes = CustomData_get_layer(&origmesh->vdata, CD_MVERT_SKIN); - mvert = BKE_mesh_vertices(origmesh); + mvert = BKE_mesh_verts(origmesh); dvert = BKE_mesh_deform_verts(origmesh); medge = BKE_mesh_edges(origmesh); verts_num = origmesh->totvert; diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c index d7b2db87a60..343aa3920d9 100644 --- a/source/blender/modifiers/intern/MOD_solidify_extrude.c +++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c @@ -66,7 +66,7 @@ static void mesh_calc_hq_normal(Mesh *mesh, const int verts_num = mesh->totvert; const int edges_num = mesh->totedge; const int polys_num = mesh->totpoly; - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MLoop *mloop = BKE_mesh_loops(mesh); const MEdge *medge = BKE_mesh_edges(mesh); @@ -215,9 +215,9 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex MOD_get_vgroup(ctx->object, mesh, smd->defgrp_name, &dvert, &defgrp_index); - const MVert *orig_mvert = BKE_mesh_vertices(mesh); + const MVert *orig_mvert = BKE_mesh_verts(mesh); const MEdge *orig_medge = BKE_mesh_edges(mesh); - const MPoly *orig_mpoly = BKE_mesh_polygons(mesh); + const MPoly *orig_mpoly = BKE_mesh_polys(mesh); const MLoop *orig_mloop = BKE_mesh_loops(mesh); if (need_poly_normals) { @@ -335,9 +335,9 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex (int)((loops_num * stride) + newLoops), (int)((polys_num * stride) + newPolys)); - MVert *mvert = BKE_mesh_vertices_for_write(result); + MVert *mvert = BKE_mesh_verts_for_write(result); MEdge *medge = BKE_mesh_edges_for_write(result); - MPoly *mpoly = BKE_mesh_polygons_for_write(result); + MPoly *mpoly = BKE_mesh_polys_for_write(result); MLoop *mloop = BKE_mesh_loops_for_write(result); if (do_bevel_convex) { diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c index 0bce954a67a..e73df0d1c12 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c @@ -184,9 +184,9 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md, const bool do_flat_faces = dvert && (smd->flag & MOD_SOLIDIFY_NONMANIFOLD_FLAT_FACES); - const MVert *orig_mvert = BKE_mesh_vertices(mesh); + const MVert *orig_mvert = BKE_mesh_verts(mesh); const MEdge *orig_medge = BKE_mesh_edges(mesh); - const MPoly *orig_mpoly = BKE_mesh_polygons(mesh); + const MPoly *orig_mpoly = BKE_mesh_polys(mesh); const MLoop *orig_mloop = BKE_mesh_loops(mesh); uint new_verts_num = 0; @@ -1957,9 +1957,9 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md, (int)(new_loops_num), (int)(new_polys_num)); - MVert *mvert = BKE_mesh_vertices_for_write(result); + MVert *mvert = BKE_mesh_verts_for_write(result); MEdge *medge = BKE_mesh_edges_for_write(result); - MPoly *mpoly = BKE_mesh_polygons_for_write(result); + MPoly *mpoly = BKE_mesh_polys_for_write(result); MLoop *mloop = BKE_mesh_loops_for_write(result); int *origindex_edge = CustomData_get_layer(&result->edata, CD_ORIGINDEX); diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 93da7969a09..c5e117635b5 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -151,7 +151,7 @@ static void deformVerts(ModifierData *md, } /* convert to global coordinates and calculate velocity */ - MVert *verts = BKE_mesh_vertices_for_write(surmd->mesh); + MVert *verts = BKE_mesh_verts_for_write(surmd->mesh); for (i = 0, x = surmd->x, v = surmd->v; i < mesh_verts_num; i++, x++, v++) { float *vec = verts[i].co; mul_m4_v3(ctx->object->obmat, vec); diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 50071cad1b9..e0083b37ef0 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1171,8 +1171,8 @@ static bool surfacedeformBind(Object *ob, Mesh *mesh) { BVHTreeFromMesh treeData = {NULL}; - const MVert *mvert = BKE_mesh_vertices(target); - const MPoly *mpoly = BKE_mesh_polygons(target); + const MVert *mvert = BKE_mesh_verts(target); + const MPoly *mpoly = BKE_mesh_polys(target); const MEdge *medge = BKE_mesh_edges(target); const MLoop *mloop = BKE_mesh_loops(target); uint tedges_num = target->totedge; diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 654d2c51c34..bc1a04d65ce 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -94,7 +94,7 @@ void MOD_get_texture_coords(MappingInfoModifierData *dmd, /* UVs need special handling, since they come from faces */ if (texmapping == MOD_DISP_MAP_UV) { if (CustomData_has_layer(&mesh->ldata, CD_MLOOPUV)) { - const MPoly *mpoly = BKE_mesh_polygons(mesh); + const MPoly *mpoly = BKE_mesh_polys(mesh); const MPoly *mp; const MLoop *mloop = BKE_mesh_loops(mesh); BLI_bitmap *done = BLI_BITMAP_NEW(verts_num, __func__); @@ -130,7 +130,7 @@ void MOD_get_texture_coords(MappingInfoModifierData *dmd, texmapping = MOD_DISP_MAP_LOCAL; } - const MVert *mv = BKE_mesh_vertices(mesh); + const MVert *mv = BKE_mesh_verts(mesh); for (i = 0; i < verts_num; i++, mv++, r_texco++) { switch (texmapping) { case MOD_DISP_MAP_LOCAL: diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 9af201c924f..8db92fefd31 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -204,7 +204,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd, } } - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); /* apply coords as UVs */ diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 9561f177cf1..ba6e18f6b7e 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -195,7 +195,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * /* make sure we're using an existing layer */ CustomData_validate_layer_name(&mesh->ldata, CD_MLOOPUV, umd->uvlayer_name, uvname); - const MPoly *polys = BKE_mesh_polygons(mesh); + const MPoly *polys = BKE_mesh_polys(mesh); const MLoop *loops = BKE_mesh_loops(mesh); polys_num = mesh->totpoly; loops_num = mesh->totloop; diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index c6c0ce58463..05c6eea9f8b 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -579,9 +579,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * const int edges_num = result->totedge; const int loops_num = result->totloop; const int polys_num = result->totpoly; - const MVert *mvert = BKE_mesh_vertices(result); + const MVert *mvert = BKE_mesh_verts(result); MEdge *medge = BKE_mesh_edges_for_write(result); - const MPoly *mpoly = BKE_mesh_polygons(result); + const MPoly *mpoly = BKE_mesh_polys(result); const MLoop *mloop = BKE_mesh_loops(result); /* Right now: diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc index d03f036eaa4..c8b692651e9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc @@ -46,7 +46,7 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords) } /* Copy vertices. */ - MutableSpan<MVert> dst_verts = result->vertices_for_write(); + MutableSpan<MVert> dst_verts = result->verts_for_write(); for (const int i : IndexRange(verts_num)) { float co[3]; int original_index; @@ -109,7 +109,7 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords) /* Copy faces. */ Array<int> loops; int j = 0; - MutableSpan<MPoly> polys = result->polygons_for_write(); + MutableSpan<MPoly> polys = result->polys_for_write(); MutableSpan<MLoop> mesh_loops = result->loops_for_write(); MLoop *loop = mesh_loops.data(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index 580886ad6be..c675ee472cd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -79,9 +79,9 @@ static Mesh *cdt_to_mesh(const meshintersect::CDT_result<double> &result) } Mesh *mesh = BKE_mesh_new_nomain(vert_len, edge_len, 0, loop_len, poly_len); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); for (const int i : IndexRange(result.vert.size())) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc index 07b419cc05c..e8dbfbde401 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc @@ -66,10 +66,10 @@ static void deform_curves(const CurvesGeometry &curves, const float4x4 curves_to_surface = surface_to_curves.inverted(); - const Span<MVert> surface_verts_old = surface_mesh_old.vertices(); + const Span<MVert> surface_verts_old = surface_mesh_old.verts(); const Span<MLoop> surface_loops_old = surface_mesh_old.loops(); - const Span<MVert> surface_verts_new = surface_mesh_new.vertices(); + const Span<MVert> surface_verts_new = surface_mesh_new.verts(); const Span<MLoop> surface_loops_new = surface_mesh_new.loops(); threading::parallel_for(curves.curves_range(), 256, [&](const IndexRange range) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index a4096efb79f..1c8a34dab1f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -161,7 +161,7 @@ static void copy_face_corner_attributes(const Map<AttributeIDRef, AttributeKind> const Span<int> selected_poly_indices, const Mesh &mesh_in) { - const Span<MPoly> polys = mesh_in.polygons(); + const Span<MPoly> polys = mesh_in.polys(); Vector<int64_t> indices; indices.reserve(selected_loops_num); for (const int src_poly_index : selected_poly_indices) { @@ -181,8 +181,8 @@ static void copy_masked_vertices_to_new_mesh(const Mesh &src_mesh, Span<int> vertex_map) { BLI_assert(src_mesh.totvert == vertex_map.size()); - const Span<MVert> src_verts = src_mesh.vertices(); - MutableSpan<MVert> dst_verts = dst_mesh.vertices_for_write(); + const Span<MVert> src_verts = src_mesh.verts(); + MutableSpan<MVert> dst_verts = dst_mesh.verts_for_write(); for (const int i_src : vertex_map.index_range()) { const int i_dst = vertex_map[i_src]; @@ -239,9 +239,9 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh, Span<int> masked_poly_indices, Span<int> new_loop_starts) { - const Span<MPoly> src_polygons = src_mesh.polygons(); + const Span<MPoly> src_polygons = src_mesh.polys(); const Span<MLoop> src_loops = src_mesh.loops(); - MutableSpan<MPoly> dst_polygons = dst_mesh.polygons_for_write(); + MutableSpan<MPoly> dst_polygons = dst_mesh.polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh.loops_for_write(); for (const int i_dst : masked_poly_indices.index_range()) { @@ -270,9 +270,9 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh, Span<int> masked_poly_indices, Span<int> new_loop_starts) { - const Span<MPoly> src_polygons = src_mesh.polygons(); + const Span<MPoly> src_polygons = src_mesh.polys(); const Span<MLoop> src_loops = src_mesh.loops(); - MutableSpan<MPoly> dst_polygons = dst_mesh.polygons_for_write(); + MutableSpan<MPoly> dst_polygons = dst_mesh.polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh.loops_for_write(); for (const int i_dst : masked_poly_indices.index_range()) { @@ -302,9 +302,9 @@ static void copy_masked_polys_to_new_mesh(const Mesh &src_mesh, Span<int> masked_poly_indices, Span<int> new_loop_starts) { - const Span<MPoly> src_polygons = src_mesh.polygons(); + const Span<MPoly> src_polygons = src_mesh.polys(); const Span<MLoop> src_loops = src_mesh.loops(); - MutableSpan<MPoly> dst_polygons = dst_mesh.polygons_for_write(); + MutableSpan<MPoly> dst_polygons = dst_mesh.polys_for_write(); MutableSpan<MLoop> dst_loops = dst_mesh.loops_for_write(); for (const int i_dst : masked_poly_indices.index_range()) { @@ -460,7 +460,7 @@ static void compute_selected_polygons_from_vertex_selection(const Mesh &mesh, int *r_selected_loops_num) { BLI_assert(mesh.totvert == vertex_selection.size()); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_selected_poly_indices.reserve(mesh.totpoly); @@ -565,7 +565,7 @@ static void compute_selected_polygons_from_edge_selection(const Mesh &mesh, int *r_selected_polys_num, int *r_selected_loops_num) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_selected_poly_indices.reserve(mesh.totpoly); @@ -714,7 +714,7 @@ static void compute_selected_polygons_from_poly_selection(const Mesh &mesh, int *r_selected_loops_num) { BLI_assert(mesh.totpoly == poly_selection.size()); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); r_selected_poly_indices.reserve(mesh.totpoly); r_loop_starts.reserve(mesh.totloop); @@ -748,7 +748,7 @@ static void compute_selected_mesh_data_from_poly_selection_edge_face( { BLI_assert(mesh.totpoly == poly_selection.size()); BLI_assert(mesh.totedge == r_edge_map.size()); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_edge_map.fill(-1); @@ -799,7 +799,7 @@ static void compute_selected_mesh_data_from_poly_selection(const Mesh &mesh, { BLI_assert(mesh.totpoly == poly_selection.size()); BLI_assert(mesh.totedge == r_edge_map.size()); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_vertex_map.fill(-1); @@ -996,7 +996,7 @@ static void do_mesh_separation(GeometrySet &geometry_set, selected_polys_num); /* Copy the selected parts of the mesh over to the new mesh. */ - mesh_out->vertices_for_write().copy_from(mesh_in.vertices()); + mesh_out->verts_for_write().copy_from(mesh_in.verts()); copy_masked_edges_to_new_mesh(mesh_in, *mesh_out, edge_map); copy_masked_polys_to_new_mesh( mesh_in, *mesh_out, edge_map, selected_poly_indices, new_loop_starts); @@ -1059,7 +1059,7 @@ static void do_mesh_separation(GeometrySet &geometry_set, &mesh_in, mesh_in.totvert, mesh_in.totedge, 0, selected_loops_num, selected_polys_num); /* Copy the selected parts of the mesh over to the new mesh. */ - mesh_out->vertices_for_write().copy_from(mesh_in.vertices()); + mesh_out->verts_for_write().copy_from(mesh_in.verts()); mesh_out->edges_for_write().copy_from(mesh_in.edges()); copy_masked_polys_to_new_mesh(mesh_in, *mesh_out, selected_poly_indices, new_loop_starts); diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index 2bb321a349a..aaab259fc51 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -105,7 +105,7 @@ static void sample_mesh_surface(const Mesh &mesh, Vector<float3> &r_bary_coords, Vector<int> &r_looptri_indices) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MLoop> loops = mesh.loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(&mesh), BKE_mesh_runtime_looptri_len(&mesh)}; @@ -350,7 +350,7 @@ BLI_NOINLINE static void compute_attribute_outputs(const Mesh &mesh, attribute_outputs.rotation_id.get(), ATTR_DOMAIN_POINT); } - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MLoop> loops = mesh.loops(); const Span<MLoopTri> looptris{BKE_mesh_runtime_looptri_ensure(&mesh), BKE_mesh_runtime_looptri_len(&mesh)}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc index 1b9e9ae9b4a..7d81ee91a1c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc @@ -210,7 +210,7 @@ static void calc_boundaries(const Mesh &mesh, BLI_assert(r_vertex_types.size() == mesh.totvert); BLI_assert(r_edge_types.size() == mesh.totedge); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); r_vertex_types.fill(VertexType::Loose); @@ -263,7 +263,7 @@ static void calc_boundaries(const Mesh &mesh, static void create_vertex_poly_map(const Mesh &mesh, MutableSpan<Vector<int>> r_vertex_poly_indices) { - const Span<MPoly> polygons = mesh.polygons(); + const Span<MPoly> polygons = mesh.polys(); const Span<MLoop> loops = mesh.loops(); for (const int i : polygons.index_range()) { const MPoly &poly = polygons[i]; @@ -635,9 +635,9 @@ static void calc_dual_mesh(GeometrySet &geometry_set, const bool keep_boundaries) { const Mesh &mesh_in = *in_component.get_for_read(); - const Span<MVert> src_verts = mesh_in.vertices(); + const Span<MVert> src_verts = mesh_in.verts(); const Span<MEdge> src_edges = mesh_in.edges(); - const Span<MPoly> src_polys = mesh_in.polygons(); + const Span<MPoly> src_polys = mesh_in.polys(); const Span<MLoop> src_loops = mesh_in.loops(); Map<AttributeIDRef, AttributeKind> attributes; @@ -921,9 +921,9 @@ static void calc_dual_mesh(GeometrySet &geometry_set, bke::mesh_attributes(mesh_in), bke::mesh_attributes_for_write(*mesh_out)); - MutableSpan<MVert> dst_verts = mesh_out->vertices_for_write(); + MutableSpan<MVert> dst_verts = mesh_out->verts_for_write(); MutableSpan<MEdge> dst_edges = mesh_out->edges_for_write(); - MutableSpan<MPoly> dst_polys = mesh_out->polygons_for_write(); + MutableSpan<MPoly> dst_polys = mesh_out->polys_for_write(); MutableSpan<MLoop> dst_loops = mesh_out->loops_for_write(); int loop_start = 0; diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index 9af1536a194..f0018e91478 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -486,7 +486,7 @@ static void copy_stable_id_faces(const Mesh &mesh, VArraySpan<int> src{src_attribute.varray.typed<int>()}; MutableSpan<int> dst = dst_attribute.span.typed<int>(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); int loop_index = 0; for (const int i_poly : selection.index_range()) { const IndexRange range = range_for_offsets_index(poly_offsets, i_poly); @@ -522,9 +522,9 @@ static void duplicate_faces(GeometrySet &geometry_set, geometry_set.keep_only_during_modify({GEO_COMPONENT_TYPE_MESH}); const Mesh &mesh = *geometry_set.get_mesh_for_read(); - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); bke::MeshFieldContext field_context{mesh, ATTR_DOMAIN_FACE}; @@ -547,9 +547,9 @@ static void duplicate_faces(GeometrySet &geometry_set, offsets[selection.size()] = total_polys; Mesh *new_mesh = BKE_mesh_new_nomain(total_loops, total_loops, 0, total_loops, total_polys); - MutableSpan<MVert> new_verts = new_mesh->vertices_for_write(); + MutableSpan<MVert> new_verts = new_mesh->verts_for_write(); MutableSpan<MEdge> new_edges = new_mesh->edges_for_write(); - MutableSpan<MPoly> new_polys = new_mesh->polygons_for_write(); + MutableSpan<MPoly> new_polys = new_mesh->polys_for_write(); MutableSpan<MLoop> new_loops = new_mesh->loops_for_write(); Array<int> vert_mapping(new_verts.size()); @@ -904,7 +904,7 @@ static void duplicate_points_mesh(GeometrySet &geometry_set, const IndexAttributes &attribute_outputs) { const Mesh &mesh = *geometry_set.get_mesh_for_read(); - const Span<MVert> src_verts = mesh.vertices(); + const Span<MVert> src_verts = mesh.verts(); bke::MeshFieldContext field_context{mesh, ATTR_DOMAIN_POINT}; FieldEvaluator evaluator{field_context, src_verts.size()}; @@ -917,7 +917,7 @@ static void duplicate_points_mesh(GeometrySet &geometry_set, Array<int> offsets = accumulate_counts_to_offsets(selection, counts); Mesh *new_mesh = BKE_mesh_new_nomain(offsets.last(), 0, 0, 0, 0); - MutableSpan<MVert> dst_verts = new_mesh->vertices_for_write(); + MutableSpan<MVert> dst_verts = new_mesh->verts_for_write(); threaded_slice_fill(offsets.as_span(), selection, src_verts, dst_verts); diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index d81b335ebb3..d335a162776 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -245,7 +245,7 @@ static void extrude_mesh_vertices(Mesh &mesh, const IndexRange new_vert_range{orig_vert_size, selection.size()}; const IndexRange new_edge_range{orig_edge_size, selection.size()}; - MutableSpan<MVert> new_verts = mesh.vertices_for_write().slice(new_vert_range); + MutableSpan<MVert> new_verts = mesh.verts_for_write().slice(new_vert_range); MutableSpan<MEdge> new_edges = mesh.edges_for_write().slice(new_edge_range); for (const int i_selection : selection.index_range()) { @@ -311,7 +311,7 @@ static void extrude_mesh_vertices(Mesh &mesh, static Array<Vector<int, 2>> mesh_calculate_polys_of_edge(const Mesh &mesh) { - Span<MPoly> polys = mesh.polygons(); + Span<MPoly> polys = mesh.polys(); Span<MLoop> loops = mesh.loops(); Array<Vector<int, 2>> polys_of_edge(mesh.totedge); @@ -389,7 +389,7 @@ static void extrude_mesh_edges(Mesh &mesh, { const int orig_vert_size = mesh.totvert; Span<MEdge> orig_edges = mesh.edges(); - Span<MPoly> orig_polys = mesh.polygons(); + Span<MPoly> orig_polys = mesh.polys(); const int orig_loop_size = mesh.totloop; bke::MeshFieldContext edge_context{mesh, ATTR_DOMAIN_EDGE}; @@ -441,7 +441,7 @@ static void extrude_mesh_edges(Mesh &mesh, MutableSpan<MEdge> edges = mesh.edges_for_write(); MutableSpan<MEdge> connect_edges = edges.slice(connect_edge_range); MutableSpan<MEdge> duplicate_edges = edges.slice(duplicate_edge_range); - MutableSpan<MPoly> polys = mesh.polygons_for_write(); + MutableSpan<MPoly> polys = mesh.polys_for_write(); MutableSpan<MPoly> new_polys = polys.slice(new_poly_range); MutableSpan<MLoop> loops = mesh.loops_for_write(); MutableSpan<MLoop> new_loops = loops.slice(new_loop_range); @@ -606,7 +606,7 @@ static void extrude_mesh_edges(Mesh &mesh, return true; }); - MutableSpan<MVert> new_verts = mesh.vertices_for_write().slice(new_vert_range); + MutableSpan<MVert> new_verts = mesh.verts_for_write().slice(new_vert_range); if (edge_offsets.is_single()) { const float3 offset = edge_offsets.get_internal_single(); threading::parallel_for(new_verts.index_range(), 1024, [&](const IndexRange range) { @@ -653,7 +653,7 @@ static void extrude_mesh_face_regions(Mesh &mesh, { const int orig_vert_size = mesh.totvert; Span<MEdge> orig_edges = mesh.edges(); - Span<MPoly> orig_polys = mesh.polygons(); + Span<MPoly> orig_polys = mesh.polys(); Span<MLoop> orig_loops = mesh.loops(); bke::MeshFieldContext poly_context{mesh, ATTR_DOMAIN_FACE}; @@ -785,7 +785,7 @@ static void extrude_mesh_face_regions(Mesh &mesh, MutableSpan<MEdge> connect_edges = edges.slice(connect_edge_range); MutableSpan<MEdge> boundary_edges = edges.slice(boundary_edge_range); MutableSpan<MEdge> new_inner_edges = edges.slice(new_inner_edge_range); - MutableSpan<MPoly> polys = mesh.polygons_for_write(); + MutableSpan<MPoly> polys = mesh.polys_for_write(); MutableSpan<MPoly> new_polys = polys.slice(side_poly_range); MutableSpan<MLoop> loops = mesh.loops_for_write(); MutableSpan<MLoop> new_loops = loops.slice(side_loop_range); @@ -976,7 +976,7 @@ static void extrude_mesh_face_regions(Mesh &mesh, /* Translate vertices based on the offset. If the vertex is used by a selected edge, it will * have been duplicated and only the new vertex should use the offset. Otherwise the vertex might * still need an offset, but it was reused on the inside of a region of extruded faces. */ - MutableSpan<MVert> verts = mesh.vertices_for_write(); + MutableSpan<MVert> verts = mesh.verts_for_write(); if (poly_offsets.is_single()) { const float3 offset = poly_offsets.get_internal_single(); threading::parallel_for( @@ -1038,7 +1038,7 @@ static void extrude_individual_mesh_faces(Mesh &mesh, { const int orig_vert_size = mesh.totvert; const int orig_edge_size = mesh.totedge; - Span<MPoly> orig_polys = mesh.polygons(); + Span<MPoly> orig_polys = mesh.polys(); Span<MLoop> orig_loops = mesh.loops(); /* Use a mesh for the result of the evaluation because the mesh is reallocated before @@ -1078,11 +1078,11 @@ static void extrude_individual_mesh_faces(Mesh &mesh, side_poly_range.size(), side_loop_range.size()); - MutableSpan<MVert> new_verts = mesh.vertices_for_write().slice(new_vert_range); + MutableSpan<MVert> new_verts = mesh.verts_for_write().slice(new_vert_range); MutableSpan<MEdge> edges = mesh.edges_for_write(); MutableSpan<MEdge> connect_edges = edges.slice(connect_edge_range); MutableSpan<MEdge> duplicate_edges = edges.slice(duplicate_edge_range); - MutableSpan<MPoly> polys = mesh.polygons_for_write(); + MutableSpan<MPoly> polys = mesh.polys_for_write(); MutableSpan<MPoly> new_polys = polys.slice(side_poly_range); MutableSpan<MLoop> loops = mesh.loops_for_write(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc index 2d642ad13d5..fc9c9870c5c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc @@ -30,7 +30,7 @@ static void mesh_flip_faces(Mesh &mesh, const Field<bool> &selection_field) evaluator.evaluate(); const IndexMask selection = evaluator.get_evaluated_as_mask(0); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); MutableSpan<MLoop> loops = mesh.loops_for_write(); for (const int i : selection.index_range()) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc index 4b5ea1c8742..f2304849cbc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc @@ -64,8 +64,8 @@ class AngleFieldInput final : public bke::MeshFieldInput { const eAttrDomain domain, IndexMask UNUSED(mask)) const final { - const Span<MVert> verts = mesh.vertices(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); Array<EdgeMapEntry> edge_map = create_edge_map(polys, loops, mesh.totedge); @@ -109,9 +109,9 @@ class SignedAngleFieldInput final : public bke::MeshFieldInput { const eAttrDomain domain, IndexMask UNUSED(mask)) const final { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); Array<EdgeMapEntry> edge_map = create_edge_map(polys, loops, mesh.totedge); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc index 7fd2df7c552..50ebf78e58f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc @@ -79,7 +79,7 @@ static VArray<float3> construct_edge_positions_gvarray(const Mesh &mesh, const VertexNumber vertex, const eAttrDomain domain) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); if (vertex == VERTEX_ONE) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc index 7dfeaa8e8d9..c4d792c6c9a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc @@ -18,8 +18,8 @@ static void node_declare(NodeDeclarationBuilder &b) static VArray<float> construct_face_area_varray(const Mesh &mesh, const eAttrDomain domain) { - const Span<MVert> verts = mesh.vertices(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); auto area_fn = [verts, polys, loops](const int i) -> float { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc index b316639fd0a..040b243a868 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc @@ -37,8 +37,8 @@ class PlanarFieldInput final : public bke::MeshFieldInput { const eAttrDomain domain, IndexMask /*mask*/) const final { - const Span<MVert> verts = mesh.vertices(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); const Span<float3> poly_normals{(float3 *)BKE_mesh_poly_normals_ensure(&mesh), mesh.totpoly}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc index 59d30b997a6..cd58a0ad428 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc @@ -21,7 +21,7 @@ static void node_declare(NodeDeclarationBuilder &b) static VArray<int> construct_neighbor_count_varray(const Mesh &mesh, const eAttrDomain domain) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); Array<int> edge_count(mesh.totedge, 0); @@ -70,7 +70,7 @@ class FaceNeighborCountFieldInput final : public bke::MeshFieldInput { static VArray<int> construct_vertex_count_varray(const Mesh &mesh, const eAttrDomain domain) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); return bke::mesh_attributes(mesh).adapt_domain<int>( VArray<int>::ForFunc(polys.size(), [polys](const int i) -> float { return polys[i].totloop; }), diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index ba3871adc76..801b3c78060 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -109,9 +109,9 @@ static Mesh *create_circle_mesh(const float radius, circle_corner_total(fill_type, verts_num), circle_face_total(fill_type, verts_num)); BKE_id_material_eval_ensure_default_slot(&mesh->id); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); /* Assign vertex coordinates. */ diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc index 98ae1ef1275..93ecc96337e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc @@ -657,7 +657,7 @@ static Mesh *create_vertex_mesh() { /* Returns a mesh with a single vertex at the origin. */ Mesh *mesh = BKE_mesh_new_nomain(1, 0, 0, 0, 0); - copy_v3_fl3(mesh->vertices_for_write().first().co, 0.0f, 0.0f, 0.0f); + copy_v3_fl3(mesh->verts_for_write().first().co, 0.0f, 0.0f, 0.0f); return mesh; } @@ -689,9 +689,9 @@ Mesh *create_cylinder_or_cone_mesh(const float radius_top, config.tot_verts, config.tot_edges, 0, config.tot_corners, config.tot_faces); BKE_id_material_eval_ensure_default_slot(&mesh->id); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); calculate_cone_vertices(verts, config); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc index 656c5988bef..d8a4db43b27 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc @@ -49,9 +49,9 @@ Mesh *create_grid_mesh(const int verts_x, 0, edges_x * edges_y * 4, edges_x * edges_y); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc index 130fb8ae589..b2f629806cd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc @@ -179,7 +179,7 @@ Mesh *create_line_mesh(const float3 start, const float3 delta, const int count) Mesh *mesh = BKE_mesh_new_nomain(count, count - 1, 0, 0, 0); BKE_id_material_eval_ensure_default_slot(&mesh->id); - MutableSpan<MVert> vertices = mesh->vertices_for_write(); + MutableSpan<MVert> vertices = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); threading::parallel_invoke( diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc index 48a95bfcb49..017132b1a43 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc @@ -301,9 +301,9 @@ static Mesh *create_uv_sphere_mesh(const float radius, const int segments, const sphere_corner_total(segments, rings), sphere_face_total(segments, rings)); BKE_id_material_eval_ensure_default_slot(&mesh->id); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); MutableSpan<MEdge> edges = mesh->edges_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); threading::parallel_invoke( diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc index fc467a9424d..8fd05e70ed3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc @@ -158,9 +158,9 @@ static void scale_vertex_islands_uniformly(Mesh &mesh, const UniformScaleParams ¶ms, const GetVertexIndicesFn get_vertex_indices) { - MutableSpan<MVert> verts = mesh.vertices_for_write(); + MutableSpan<MVert> verts = mesh.verts_for_write(); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); threading::parallel_for(islands.index_range(), 256, [&](const IndexRange range) { @@ -199,9 +199,9 @@ static void scale_vertex_islands_on_axis(Mesh &mesh, const AxisScaleParams ¶ms, const GetVertexIndicesFn get_vertex_indices) { - MutableSpan<MVert> verts = mesh.vertices_for_write(); + MutableSpan<MVert> verts = mesh.verts_for_write(); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); threading::parallel_for(islands.index_range(), 256, [&](const IndexRange range) { @@ -245,7 +245,7 @@ static void scale_vertex_islands_on_axis(Mesh &mesh, static Vector<ElementIsland> prepare_face_islands(const Mesh &mesh, const IndexMask face_selection) { - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); /* Use the disjoint set data structure to determine which vertices have to be scaled together. */ diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc index ce453a8ef32..613f140ff0a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc @@ -36,7 +36,7 @@ static void set_computed_position_and_offset(GeometryComponent &component, switch (component.type()) { case GEO_COMPONENT_TYPE_MESH: { Mesh *mesh = static_cast<MeshComponent &>(component).get_for_write(); - MutableSpan<MVert> verts = mesh->vertices_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); if (in_positions.is_same(positions.varray)) { devirtualize_varray(in_offsets, [&](const auto in_offsets) { threading::parallel_for( diff --git a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc index 6be37a02bd5..13bfe78fbe5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc @@ -264,8 +264,8 @@ static void get_closest_mesh_corners(const Mesh &mesh, const MutableSpan<float> r_distances_sq, const MutableSpan<float3> r_positions) { - const Span<MVert> verts = mesh.vertices(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); BLI_assert(mesh.totloop > 0); diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc index 5900e234220..4953a0aa8d0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc @@ -37,8 +37,8 @@ static VArray<float3> construct_uv_gvarray(const Mesh &mesh, const float margin, const eAttrDomain domain) { - const Span<MVert> verts = mesh.vertices(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MVert> verts = mesh.verts(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); bke::MeshFieldContext face_context{mesh, ATTR_DOMAIN_FACE}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc index 3095cac6a50..513b9534c55 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc @@ -62,9 +62,9 @@ static VArray<float3> construct_uv_gvarray(const Mesh &mesh, const GeometryNodeUVUnwrapMethod method, const eAttrDomain domain) { - const Span<MVert> verts = mesh.vertices(); + const Span<MVert> verts = mesh.verts(); const Span<MEdge> edges = mesh.edges(); - const Span<MPoly> polys = mesh.polygons(); + const Span<MPoly> polys = mesh.polys(); const Span<MLoop> loops = mesh.loops(); bke::MeshFieldContext face_context{mesh, ATTR_DOMAIN_FACE}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 5788a744041..46708f53087 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -123,8 +123,8 @@ static Mesh *create_mesh_from_volume_grids(Span<openvdb::GridBase::ConstPtr> gri Mesh *mesh = BKE_mesh_new_nomain(vert_offset, 0, 0, loop_offset, poly_offset); BKE_id_material_eval_ensure_default_slot(&mesh->id); - MutableSpan<MVert> verts = mesh->vertices_for_write(); - MutableSpan<MPoly> polys = mesh->polygons_for_write(); + MutableSpan<MVert> verts = mesh->verts_for_write(); + MutableSpan<MPoly> polys = mesh->polys_for_write(); MutableSpan<MLoop> loops = mesh->loops_for_write(); for (const int i : grids.index_range()) { diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index 4ce2fcaae4a..b923a9dfb14 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -1148,7 +1148,7 @@ static PyObject *C_BVHTree_FromObject(PyObject *UNUSED(cls), PyObject *args, PyO coords = MEM_mallocN(sizeof(*coords) * (size_t)coords_len, __func__); tris = MEM_mallocN(sizeof(*tris) * (size_t)tris_len, __func__); - const MVert *verts = BKE_mesh_vertices(mesh); + const MVert *verts = BKE_mesh_verts(mesh); for (int i = 0; i < mesh->totvert; i++) { copy_v3_v3(coords[i], verts[i].co); } diff --git a/source/blender/render/intern/bake.c b/source/blender/render/intern/bake.c index 64875ada5db..c383d13e4e1 100644 --- a/source/blender/render/intern/bake.c +++ b/source/blender/render/intern/bake.c @@ -459,8 +459,8 @@ static TriTessFace *mesh_calc_tri_tessface(Mesh *me, bool tangent, Mesh *me_eval unsigned int mpoly_prev = UINT_MAX; float no[3]; - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); looptri = MEM_mallocN(sizeof(*looptri) * tottri, __func__); @@ -741,8 +741,8 @@ void RE_bake_pixels_populate(Mesh *me, const int tottri = poly_to_tri_count(me->totpoly, me->totloop); MLoopTri *looptri = MEM_mallocN(sizeof(*looptri) * tottri, __func__); - const MVert *verts = BKE_mesh_vertices(me); - const MPoly *polys = BKE_mesh_polygons(me); + const MVert *verts = BKE_mesh_verts(me); + const MPoly *polys = BKE_mesh_polys(me); const MLoop *loops = BKE_mesh_loops(me); BKE_mesh_recalc_looptri(loops, polys, verts, me->totloop, me->totpoly, looptri); diff --git a/source/blender/render/intern/multires_bake.c b/source/blender/render/intern/multires_bake.c index ecb7df979fb..79eddd20bdf 100644 --- a/source/blender/render/intern/multires_bake.c +++ b/source/blender/render/intern/multires_bake.c @@ -485,13 +485,13 @@ static void do_multires_bake(MultiresBakeRender *bkr, Mesh *temp_mesh = BKE_mesh_new_nomain( dm->getNumVerts(dm), dm->getNumEdges(dm), 0, dm->getNumLoops(dm), dm->getNumPolys(dm)); - memcpy(BKE_mesh_vertices_for_write(temp_mesh), + memcpy(BKE_mesh_verts_for_write(temp_mesh), dm->getVertArray(dm), temp_mesh->totvert * sizeof(MVert)); memcpy(BKE_mesh_edges_for_write(temp_mesh), dm->getEdgeArray(dm), temp_mesh->totedge * sizeof(MEdge)); - memcpy(BKE_mesh_polygons_for_write(temp_mesh), + memcpy(BKE_mesh_polys_for_write(temp_mesh), dm->getPolyArray(dm), temp_mesh->totpoly * sizeof(MPoly)); memcpy(BKE_mesh_loops_for_write(temp_mesh), diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index eae849e1968..66ab7ba6e2e 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -505,7 +505,7 @@ static void generate_margin(ImBuf *ibuf, totpoly = me->totpoly; totloop = me->totloop; totedge = me->totedge; - mpoly = me->polygons().data(); + mpoly = me->polys().data(); mloop = me->loops().data(); if ((uv_layer == nullptr) || (uv_layer[0] == '\0')) { @@ -520,7 +520,7 @@ static void generate_margin(ImBuf *ibuf, tottri = poly_to_tri_count(me->totpoly, me->totloop); looptri_mem = static_cast<MLoopTri *>(MEM_mallocN(sizeof(*looptri) * tottri, __func__)); BKE_mesh_recalc_looptri( - mloop, mpoly, me->vertices().data(), me->totloop, me->totpoly, looptri_mem); + mloop, mpoly, me->verts().data(), me->totloop, me->totpoly, looptri_mem); looptri = looptri_mem; } else { diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c index fdf61a1b994..2a2b62be1f0 100644 --- a/source/blender/render/intern/texture_pointdensity.c +++ b/source/blender/render/intern/texture_pointdensity.c @@ -380,7 +380,7 @@ static void pointdensity_cache_object(PointDensity *pd, Object *ob) } #endif - mvert = BKE_mesh_vertices(mesh); /* local object space */ + mvert = BKE_mesh_verts(mesh); /* local object space */ pd->totpoints = mesh->totvert; if (pd->totpoints == 0) { return; |