griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Fix typos in bmo_join_triangles.cc

Browse Source 
Fix spelling "mergable" -> "mergeable"
Found via codespell

Signed-off-by: luz paz <luzpaz@proton.me>
Pull Request: https://projects.blender.org/blender/blender/pulls/145812
This commit is contained in:
luz paz
2025-09-09 08:50:29 +02:00
committed by Pratik Borhade
parent 719e207fcc
commit afbdf50b85
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/bmesh/operators/bmo_join_triangles.cc
View File

@@ -509,7 +509,7 @@ static void add_without_duplicates(JoinEdgesNeighborInfo &neighbor_info, BMEdge
/**
* Add the neighboring edges of a given loop to the `merge_edges` and `shared_loops` arrays.
*
* \param merge_edges: the array of mergable edges to add to.
* \param merge_edges: the array of mergeable edges to add to.
* \param shared_loops: the array to shared loops to add to.
* \param count: the number of items currently in each array.
* \param l_in_quad: The loop to add the neighboring edges of, if they check out.
@@ -873,19 +873,19 @@ static void reprioritize_face_neighbors(JoinEdgesState &s, BMFace *f, float f_er
{
BLI_assert(f->len == 4);
/* Identify any mergable edges of any neighbor triangles that face us.
/* Identify any mergeable edges of any neighbor triangles that face us.
* - Some of our four edges... might not be manifold.
* - Some of our neighbor faces... might not be triangles.
* - Some of our neighbor triangles... might have other non-manifold (un-mergable) edges.
* - Some of our neighbor triangles... might have other non-manifold (unmergeable) edges.
* - Some of our neighbor triangles' manifold edges... might have non-triangle neighbors.
* Therefore, there can be have up to eight mergable edges, although there are often fewer. */
* Therefore, there can be have up to eight mergeable edges, although there are often fewer. */
JoinEdgesNeighborInfo neighbor_info = {};
/* Get the four loops around the face. */
BMLoop *l_quad[4];
BM_face_as_array_loop_quad(f, l_quad);
/* Add the mergable neighbors for each of those loops. */
/* Add the mergeable neighbors for each of those loops. */
for (int i = 0; i < ARRAY_SIZE(l_quad); i++) {
add_neighbors(neighbor_info, l_quad[i]);
}
@@ -936,7 +936,7 @@ static BMFace *bm_faces_join_pair_by_edge(BMesh *bm,
BMLoop *l_a = e->l;
BMLoop *l_b = e->l->radial_next;
/* If previous face merges have created quads, which now make this edge un-mergable,
/* If previous face merges have created quads, which now make this edge unmergeable,
* then skip it and move on. This happens frequently and that's ok.
* It's much easier and more efficient to just skip these edges when we encounter them,
* than it is to try to search the heap for them and remove them preemptively. */