From be038b844cb53bc228d3e98bfe09071560930cde Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 7 Sep 2022 00:06:31 -0500 Subject: 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. --- source/blender/blenloader/intern/versioning_250.c | 2 +- source/blender/blenloader/intern/versioning_290.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'source/blender/blenloader/intern') 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, -- cgit v1.2.3