From bb6765f28fdde392976c38712c851d0ef8c75a2c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Mar 2021 09:35:12 +1100 Subject: Cleanup: spelling --- source/blender/bmesh/intern/bmesh_interp.c | 4 ++-- source/blender/bmesh/intern/bmesh_iterators.c | 4 ++-- source/blender/bmesh/operators/bmo_connect.c | 2 +- source/blender/bmesh/operators/bmo_fill_grid.c | 4 ++-- source/blender/bmesh/operators/bmo_removedoubles.c | 2 +- source/blender/bmesh/operators/bmo_subdivide.c | 2 +- source/blender/bmesh/operators/bmo_subdivide_edgering.c | 2 +- source/blender/bmesh/tools/bmesh_decimate_collapse.c | 4 ++-- source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 2 +- source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 6857a1f3929..288c5fa8158 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -939,7 +939,7 @@ void BM_data_layer_free(BMesh *bm, CustomData *data, int type) data->pool = NULL; has_layer = CustomData_free_layer_active(data, type, 0); - /* assert because its expensive to realloc - better not do if layer isnt present */ + /* Assert because its expensive to realloc - better not do if layer isn't present. */ BLI_assert(has_layer != false); UNUSED_VARS_NDEBUG(has_layer); @@ -961,7 +961,7 @@ void BM_data_layer_free_n(BMesh *bm, CustomData *data, int type, int n) data->pool = NULL; has_layer = CustomData_free_layer(data, type, 0, CustomData_get_layer_index_n(data, type, n)); - /* assert because its expensive to realloc - better not do if layer isnt present */ + /* Assert because its expensive to realloc - better not do if layer isn't present. */ BLI_assert(has_layer != false); UNUSED_VARS_NDEBUG(has_layer); diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c index c81d4f9b67c..ff6274cff12 100644 --- a/source/blender/bmesh/intern/bmesh_iterators.c +++ b/source/blender/bmesh/intern/bmesh_iterators.c @@ -158,7 +158,7 @@ int BMO_iter_as_array(BMOpSlot slot_args[BMO_OP_MAX_SLOTS], /** * \brief Iterator as Array * - * Allocates a new array, has the advantage that you dont need to know the size ahead of time. + * Allocates a new array, has the advantage that you don't need to know the size ahead of time. * * Takes advantage of less common iterator usage to avoid counting twice, * which you might end up doing when #BM_iter_as_array is used. @@ -410,7 +410,7 @@ int BM_iter_mesh_count_flag(const char itype, BMesh *bm, const char hflag, const */ /* see bug T36923 for why we need this, - * allow adding but not removing, this isnt _totally_ safe since + * allow adding but not removing, this isn't _totally_ safe since * you could add/remove within the same loop, but catches common cases */ #ifdef DEBUG diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index b52c26a65f0..0f0427373d9 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -58,7 +58,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f, const bool check_degenera l_iter = l_first = BM_FACE_FIRST_LOOP(f); do { if (BMO_vert_flag_test(bm, l_iter->v, VERT_INPUT) && - /* ensure this vertex isnt part of a contiguous group */ + /* Ensure this vertex isn't part of a contiguous group. */ ((BMO_vert_flag_test(bm, l_iter->prev->v, VERT_INPUT) == 0) || (BMO_vert_flag_test(bm, l_iter->next->v, VERT_INPUT) == 0))) { if (!l_tag_prev) { diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index df15778558b..bb07a247a4e 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -586,8 +586,8 @@ static bool bm_edge_test_cb(BMEdge *e, void *bm_v) static bool bm_edge_test_rail_cb(BMEdge *e, void *UNUSED(bm_v)) { - /* normally operators dont check for hidden state - * but alternative would be to pass slot of rail edges */ + /* Normally operators don't check for hidden state + * but alternative would be to pass slot of rail edges. */ if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { return false; } diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 361b10520da..8cc0bfadbda 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -599,7 +599,7 @@ void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op) const short oflag = EDGE_MARK; int i; - /* check flags dont change once set */ + /* Check flags don't change once set. */ #ifndef NDEBUG int tot_test; #endif diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index be996e6ffe4..883420e59f6 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1344,7 +1344,7 @@ void BM_mesh_esubdivide(BMesh *bm, { BMOperator op; - /* use_sphere isnt exposed here since its only used for new primitives */ + /* `use_sphere` isn't exposed here since its only used for new primitives. */ BMO_op_initf(bm, &op, BMO_FLAG_DEFAULTS, diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index d72960adf89..38a27b811b0 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -932,7 +932,7 @@ static void bm_edgering_pair_order(BMesh *bm, BLI_assert(bm_edgering_pair_order_is_flipped(bm, el_store_a, el_store_b) == false); } else { - /* if we dont share and edge - flip */ + /* If we don't share and edge - flip. */ BMEdge *e = BM_edge_exists(((LinkData *)lb_a->first)->data, ((LinkData *)lb_b->first)->data); if (e == NULL || !BMO_edge_flag_test(bm, e, EDGE_RING)) { BM_edgeloop_flip(bm, el_store_b); diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 92ca8e38737..869856d0c5b 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -939,7 +939,7 @@ static bool bm_edge_collapse_is_degenerate_topology(BMEdge *e_first) * intended for speed over flexibility. * can only collapse edges connected to (1, 2) tris. * - * Important - dont add vert/edge/face data on collapsing! + * Important - don't add vert/edge/face data on collapsing! * * \param r_e_clear_other: Let caller know what edges we remove besides \a e_clear * \param customdata_flag: Merge factor, scales from 0 - 1 ('v_clear' -> 'v_other') @@ -1394,7 +1394,7 @@ void BM_mesh_decimate_collapse(BMesh *bm, * \note * - `eheap_table[e_index_mirr]` is only removed from the heap at the last moment * since its possible (in theory) for collapsing `e` to remove `e_mirr`. - * - edges sharing a vertex are ignored, so the pivot vertex isnt moved to one side. + * - edges sharing a vertex are ignored, so the pivot vertex isn't moved to one side. */ BMEdge *e = BLI_heap_pop_min(eheap); diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 2254b46f860..4a024f745ed 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -401,7 +401,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, earray[i] = e_iter; } /* Remove all edges/verts left behind from dissolving, - * NULL'ing the vertex array so we dont re-use. */ + * NULL'ing the vertex array so we don't re-use. */ for (i = bm->totedge - 1; i != -1; i--) { e_iter = earray[i]; diff --git a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c index e2741b806c2..0a512fdd592 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c +++ b/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c @@ -77,12 +77,12 @@ static bool bm_vert_dissolve_fan_test(BMVert *v) static bool bm_vert_dissolve_fan(BMesh *bm, BMVert *v) { - /* collapse under 2 conditions. + /* Collapse under 2 conditions: * - vert connects to 4 manifold edges (and 4 faces). * - vert connects to 1 manifold edge, 2 boundary edges (and 2 faces). * * This covers boundary verts of a quad grid and center verts. - * note that surrounding faces dont have to be quads. + * note that surrounding faces don't have to be quads. */ BMIter iter; -- cgit v1.2.3