Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-09-07 08:06:31 +0300
committerHans Goudey <h.goudey@me.com>2022-09-07 08:06:31 +0300
commitbe038b844cb53bc228d3e98bfe09071560930cde (patch)
tree13de4a3fc3b49a8b2075a0413dc8261603fbc718 /source/blender/render/intern
parent20daaeffce4cf9bfe48ab7c84cb9e2b1d71d2c91 (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.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/bake.c8
-rw-r--r--source/blender/render/intern/multires_bake.c4
-rw-r--r--source/blender/render/intern/texture_margin.cc4
-rw-r--r--source/blender/render/intern/texture_pointdensity.c2
4 files changed, 9 insertions, 9 deletions
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;