Commit: 3d26cd01b9ba6381eb165e11536345ae652dfb41 Author: Harley Acheson Date: Mon Oct 19 09:40:02 2020 -0700 Branches: master https://developer.blender.org/rB3d26cd01b9ba6381eb165e11536345ae652dfb41
Spelling: Apart Versus A Part Corrects incorrect usages of the fragment 'apart of' when 'a part of' was required. Differential Revision: https://developer.blender.org/D9245 Reviewed by Campbell Barton =================================================================== M source/blender/blenkernel/intern/object.c M source/blender/bmesh/bmesh.h M source/blender/bmesh/intern/bmesh_core.c M source/blender/bmesh/intern/bmesh_marking.c M source/blender/bmesh/intern/bmesh_opdefines.c M source/blender/bmesh/intern/bmesh_polygon_edgenet.c M source/blender/bmesh/intern/bmesh_walkers_impl.c M source/blender/bmesh/tools/bmesh_beautify.c M source/blender/editors/mesh/editmesh_select.c M source/blender/editors/transform/transform_orientations.c =================================================================== diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f4c4ccbc1d0..398860b6796 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -4375,7 +4375,7 @@ LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, } /** - * return all groups this object is apart of, caller must free. + * return all groups this object is a part of, caller must free. */ struct LinkNode *BKE_object_groups(Main *bmain, Scene *scene, Object *ob) { diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 5d2f739651b..4441ccc0c88 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -164,7 +164,7 @@ * * - ``bmesh_kernel_*()`` - Low level API, for primitive functions that others are built ontop of. * - ``bmesh_***()`` - Low level API function. - * - ``bm_***()`` - 'static' functions, not apart of the API at all, + * - ``bm_***()`` - 'static' functions, not a part of the API at all, * but use prefix since they operate on BMesh data. * - ``BM_***()`` - High level BMesh API function for use anywhere. * - ``BMO_***()`` - High level operator API function for use anywhere. diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 32ca90f5c13..d5ebc73dc1e 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -2913,7 +2913,7 @@ static void bmesh_edge_vert_swap__recursive(BMEdge *e, BMVert *v_dst, BMVert *v_ } /** - * This function assumes l_sep is apart of a larger fan which has already been + * This function assumes l_sep is a part of a larger fan which has already been * isolated by calling #bmesh_kernel_edge_separate to segregate it radially. */ BMVert *bmesh_kernel_unglue_region_make_vert_multi_isolated(BMesh *bm, BMLoop *l_sep) diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 61df8cf0c25..a5d02cdc4e5 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -163,7 +163,7 @@ static bool bm_edge_is_face_visible_any(const BMEdge *e) * Remove isolated selected elements when in a mode doesn't support them. * eg: in edge-mode a selected vertex must be connected to a selected edge. * - * \note this could be made apart of #BM_mesh_select_mode_flush_ex + * \note this could be made a part of #BM_mesh_select_mode_flush_ex */ void BM_mesh_select_mode_clean_ex(BMesh *bm, const short selectmode) { diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index ea64c9415b9..05b84ba21e2 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -567,7 +567,7 @@ static BMOpDefine bmo_contextual_create_def = { }, /* slots_out */ {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* newly-made face(s) */ - /* note, this is for stand-alone edges only, not edges which are apart of newly created faces */ + /* note, this is for stand-alone edges only, not edges which are a part of newly created faces */ {"edges.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* newly-made edge(s) */ {{'\0'}}, }, diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index ad153f01cd4..09c0f48c2f6 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -51,9 +51,9 @@ /* Note: All these flags _must_ be cleared on exit */ -/* face is apart of the edge-net (including the original face we're splitting) */ +/* face is a part of the edge-net (including the original face we're splitting) */ #define FACE_NET _FLAG_WALK -/* edge is apart of the edge-net we're filling */ +/* edge is a part of the edge-net we're filling */ #define EDGE_NET _FLAG_WALK /* tag verts we've visit */ #define VERT_VISIT _FLAG_WALK diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 99be57b7b53..dc9107a1616 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -834,7 +834,7 @@ static void *bmw_IslandManifoldWalker_step(BMWalker *walker) * Starts at a tool-flagged edge and walks over the edge loop */ -/* utility function to see if an edge is apart of an ngon boundary */ +/* utility function to see if an edge is a part of an ngon boundary */ static bool bm_edge_is_single(BMEdge *e) { return ((BM_edge_is_boundary(e)) && (e->l->f->len > 4) && @@ -1026,7 +1026,7 @@ static void *bmw_EdgeLoopWalker_step(BMWalker *walker) /* walk over boundary of faces but stop at corners */ (owalk.is_single == false && vert_edge_tot > 2) || - /* initial edge was a boundary, so is this edge and vertex is only apart of this face + /* initial edge was a boundary, so is this edge and vertex is only a part of this face * this lets us walk over the boundary of an ngon which is handy */ (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e))) { /* find next boundary edge in the fan */ diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index a25e4666a22..2d9b35697ff 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -119,7 +119,7 @@ static void erot_state_ex(const BMEdge *e, int v_index[2], int f_index[2]) EDGE_ORD(v_index[0], v_index[1]); /* verts of each of the 2 faces attached to this edge - * (that are not apart of this edge) */ + * (that are not a part of this edge) */ f_index[0] = BM_elem_index_get(e->l->prev->v); f_index[1] = BM_elem_index_get(e->l->radial_next->prev->v); EDGE_ORD(f_index[0], f_index[1]); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 91c9d3ed394..54d0695434d 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -5050,7 +5050,7 @@ static int verg_radial(const void *va, const void *vb) } /** - * This function leaves faces tagged which are apart of the new region. + * This function leaves faces tagged which are a part of the new region. * * \note faces already tagged are ignored, to avoid finding the same regions twice: * important when we have regions with equal face counts, see: T40309 diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 8ad61288461..69dfc4a7ad4 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -816,7 +816,7 @@ int getTransformOrientation_ex(const bContext *C, } if (em->bm->totedgesel >= 1) { - /* find an edge that's apart of v_tri (no need to search all edges) */ + /* find an edge that's a part of v_tri (no need to search all edges) */ float e_length; int j; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
