From 1d8648b13a0667d338a4e60df004be7e41525968 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Jun 2021 15:44:12 +1000 Subject: Cleanup: repeated terms in code comments & error messages --- source/blender/bmesh/bmesh_class.h | 2 +- source/blender/bmesh/intern/bmesh_mesh_normals.c | 4 ++-- source/blender/bmesh/intern/bmesh_mods.c | 8 ++++---- source/blender/bmesh/intern/bmesh_query.c | 4 ++-- source/blender/bmesh/operators/bmo_dupe.c | 10 ++++++---- source/blender/bmesh/operators/bmo_hull.c | 2 +- source/blender/bmesh/tools/bmesh_bevel.c | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 61ec1bc679e..e3efeec951e 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -142,7 +142,7 @@ typedef struct BMEdge { /** * Disk Cycle Pointers * - * relative data: d1 indicates indicates the next/prev + * relative data: d1 indicates the next/prev * edge around vertex v1 and d2 does the same for v2. */ BMDiskLink v1_disk_link, v2_disk_link; diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.c b/source/blender/bmesh/intern/bmesh_mesh_normals.c index db09bbff97c..a8a75656c94 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.c +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.c @@ -65,8 +65,8 @@ BLI_INLINE void bm_vert_calc_normals_accum_loop(const BMLoop *l_iter, float v_no[3]) { /* Calculate the dot product of the two edges that meet at the loop's vertex. */ - /* Edge vectors are calculated from e->v1 to e->v2, so adjust the dot product if one but not - * both loops actually runs from from e->v2 to e->v1. */ + /* Edge vectors are calculated from `e->v1` to `e->v2`, so adjust the dot product if one but not + * both loops actually runs from `e->v2` to `e->v1`. */ float dotprod = dot_v3v3(e1diff, e2diff); if ((l_iter->prev->e->v1 == l_iter->prev->v) ^ (l_iter->e->v1 == l_iter->v)) { dotprod = -dotprod; diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index b61ef47351a..f75497f2f19 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -246,8 +246,8 @@ BMFace *BM_faces_join_pair(BMesh *bm, BMLoop *l_a, BMLoop *l_b, const bool do_de * \param no_double: Use an existing edge if found * * \return Pointer to the newly created face representing one side of the split - * if the split is successful (and the original original face will be the - * other side). NULL if the split fails. + * if the split is successful (and the original face will be the other side). + * NULL if the split fails. */ BMFace *BM_face_split(BMesh *bm, BMFace *f, @@ -328,8 +328,8 @@ BMFace *BM_face_split(BMesh *bm, * \param example: Edge used for attributes of splitting edge, if non-NULL. * * \return Pointer to the newly created face representing one side of the split - * if the split is successful (and the original original face will be the - * other side). NULL if the split fails. + * if the split is successful (and the original face will be the other side). + * NULL if the split fails. */ BMFace *BM_face_split_n(BMesh *bm, BMFace *f, diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 1449df9925f..8047b52b625 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -1824,8 +1824,8 @@ float BM_vert_calc_edge_angle_ex(const BMVert *v, const float fallback) { BMEdge *e1, *e2; - /* saves BM_vert_edge_count(v) and and edge iterator, - * get the edges and count them both at once */ + /* Saves `BM_vert_edge_count(v)` and edge iterator, + * get the edges and count them both at once. */ if ((e1 = v->e) && (e2 = bmesh_disk_edge_next(e1, v)) && (e1 != e2) && /* make sure we come full circle and only have 2 connected edges */ diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index c128872be07..d8b30fc1a45 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -363,10 +363,12 @@ void bmo_duplicate_exec(BMesh *bm, BMOperator *op) } #if 0 /* UNUSED */ -/* executes the duplicate operation, feeding elements of - * type flag etypeflag and header flag flag to it. note, - * to get more useful information (such as the mapping from - * original to new elements) you should run the dupe op manually */ +/** + * executes the duplicate operation, feeding elements of + * type flag etypeflag and header flag to it. + * \note to get more useful information (such as the mapping from + * original to new elements) you should run the dupe op manually. + */ void BMO_dupe_from_flag(BMesh *bm, int htype, const char hflag) { BMOperator dupeop; diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 4876a12a923..38bd4499bdd 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -603,7 +603,7 @@ void bmo_convex_hull_exec(BMesh *bm, BMOperator *op) bm, op, op->slots_out, "geom_interior.out", BM_ALL_NOLOOP, HULL_FLAG_INTERIOR_ELE); /* Output slot of input elements that ended up inside the hull and - * are are unused by other geometry. */ + * are unused by other geometry. */ BMO_slot_buffer_from_enabled_flag( bm, op, op->slots_out, "geom_unused.out", BM_ALL_NOLOOP, HULL_FLAG_DEL); diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 13cd2b392d0..65cceb8dcfd 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2163,7 +2163,7 @@ static void calculate_profile(BevelParams *bp, BoundVert *bndv, bool reversed, b /* Calculate the 3D locations for the profile points */ calculate_profile_segments( pro, map, use_map, reversed, bp->seg, pro_spacing->xvals, pro_spacing->yvals, pro->prof_co); - /* Also calculate for the is the seg_2 case if it's needed. */ + /* Also calculate for the seg_2 case if it's needed. */ if (need_2) { calculate_profile_segments(pro, map, @@ -2258,7 +2258,7 @@ static void check_edge_data_seam_sharp_edges(BevVert *bv, int flag, bool neg) { EdgeHalf *e = &bv->edges[0], *efirst = &bv->edges[0]; - /* First first edge with seam or sharp edge data. */ + /* First edge with seam or sharp edge data. */ while ((!neg && !BEV_EXTEND_EDGE_DATA_CHECK(e, flag)) || (neg && BEV_EXTEND_EDGE_DATA_CHECK(e, flag))) { e = e->next; -- cgit v1.2.3