diff options
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_delete.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_error.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_inline.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_convert.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon_edgenet.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_query.c | 6 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect_pair.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_fill_grid.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c index 4e2c81c80c3..b5ff24f6d61 100644 --- a/source/blender/bmesh/intern/bmesh_delete.c +++ b/source/blender/bmesh/intern/bmesh_delete.c @@ -207,7 +207,7 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type) /* BM functions * * note! this is just a duplicate of the code above (bad!) - * but for now keep in sync, its less hassle then having to create bmesh operator flags, + * but for now keep in sync, its less hassle than having to create bmesh operator flags, * each time we need to remove some geometry. */ diff --git a/source/blender/bmesh/intern/bmesh_error.h b/source/blender/bmesh/intern/bmesh_error.h index 2307377fd71..1837ad8dd71 100644 --- a/source/blender/bmesh/intern/bmesh_error.h +++ b/source/blender/bmesh/intern/bmesh_error.h @@ -71,7 +71,7 @@ enum { # define _BMESH_DUMMY_ABORT() (void)0 #endif -/* this is meant to be higher level then BLI_assert(), +/* this is meant to be higher level than BLI_assert(), * its enabled even when in Release mode*/ #define BMESH_ASSERT(a) \ (void)((!(a)) ? ((fprintf(stderr, \ diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h index 203f44a540d..2888d7e7526 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.h @@ -100,7 +100,7 @@ BLI_INLINE void _bm_elem_flag_merge_into(BMHeader *head, * the mesh structure. * * To set the elements to valid indices 'BM_mesh_elem_index_ensure' should be used - * rather then adding inline loops, however there are cases where we still + * rather than adding inline loops, however there are cases where we still * set the index directly * * In an attempt to manage this, diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 8eed3141c7f..1393edfe8a2 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -2956,7 +2956,7 @@ void BM_mesh_rebuild(BMesh *bm, #undef REMAP_EDGE /* Cleanup, re-use local tables if the current mesh had tables allocated. - * could use irrespective but it may use more memory then the caller wants + * could use irrespective but it may use more memory than the caller wants * (and not be needed). */ if (remap & BM_VERT) { if (bm->vtable) { diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.c b/source/blender/bmesh/intern/bmesh_mesh_convert.c index 90b0cca4b9c..c30f71e029f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.c +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.c @@ -22,7 +22,7 @@ * \section bm_mesh_conv_shapekey Converting Shape Keys * * When converting to/from a Mesh/BMesh you can optionally pass a shape key to edit. - * This has the effect of editing the shape key-block rather then the original mesh vertex coords + * This has the effect of editing the shape key-block rather than the original mesh vertex coords * (although additional geometry is still allowed and uses fallback locations on converting). * * While this works for any mesh/bmesh this is made use of by entering and exiting edit-mode. @@ -1096,7 +1096,7 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const CustomData_MeshMasks * med->flag = BM_edge_flag_to_mflag(eed); /* Handle this differently to editmode switching, - * only enable draw for single user edges rather then calculating angle. */ + * only enable draw for single user edges rather than calculating angle. */ if ((med->flag & ME_EDGEDRAW) == 0) { if (eed->l && eed->l == eed->l->radial_next) { med->flag |= ME_EDGEDRAW; diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index d76a6eb0824..4c72b802396 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -53,7 +53,7 @@ * Before: +----v----+ After: +---------+ * </pre> * - * \note dissolves vert, in more situations then BM_disk_dissolve + * \note dissolves vert, in more situations than BM_disk_dissolve * (e.g. if the vert is part of a wire edge, etc). */ bool BM_vert_dissolve(BMesh *bm, BMVert *v) @@ -1052,7 +1052,7 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const bool ccw, const short check_f if ((l1 = BM_face_vert_share_loop(f, v1)) && (l2 = BM_face_vert_share_loop(f, v2)) && BM_face_split(bm, f, l1, l2, NULL, NULL, true)) { /* we should really be able to know the faces some other way, - * rather then fetching them back from the edge, but this is predictable + * rather than fetching them back from the edge, but this is predictable * where using the return values from face split isn't. - campbell */ BMFace *fa, *fb; if (BM_edge_face_pair(e_new, &fa, &fb)) { diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 4117ad67dd3..ea64c9415b9 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -57,7 +57,7 @@ /* The formatting of these bmesh operators is parsed by * 'doc/python_api/rst_from_bmesh_opdefines.py' * for use in python docs, so reStructuredText may be used - * rather then doxygen syntax. + * rather than doxygen syntax. * * template (py quotes used because nested comments don't work * on all C compilers): @@ -366,7 +366,7 @@ static BMOpDefine bmo_find_doubles_def = { /* * Remove Doubles. * - * Finds groups of vertices closer then dist and merges them together, + * Finds groups of vertices closer than dist and merges them together, * using the weld verts bmop. */ static BMOpDefine bmo_remove_doubles_def = { diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index 54dc25ebeba..ad153f01cd4 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -1667,7 +1667,7 @@ finally: } while ((tvp = tvp->next)); /* Remove edges which have become doubles since splicing vertices together, - * its less trouble then detecting future-doubles on edge-creation. */ + * its less trouble than detecting future-doubles on edge-creation. */ for (uint i = edge_net_init_len; i < edge_net_new_len; i++) { while (BM_edge_find_double(edge_net_new[i])) { BM_edge_kill(bm, edge_net_new[i]); diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index e102c1fe41c..791fa64ae7d 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -360,7 +360,7 @@ float BM_loop_point_side_of_edge_test(const BMLoop *l, const float co[3]) * Given 2 verts, * find a face they share that has the lowest angle across these verts and give back both loops. * - * This can be better then #BM_vert_pair_share_face_by_len + * This can be better than #BM_vert_pair_share_face_by_len * because concave splits are ranked lowest. */ BMFace *BM_vert_pair_share_face_by_angle( @@ -1380,7 +1380,7 @@ BMVert *BM_edge_share_vert(BMEdge *e1, BMEdge *e2) * * Finds the loop used which uses \a in face loop \a l * - * \note this function takes a loop rather then an edge + * \note this function takes a loop rather than an edge * so we can select the face that the loop should be from. */ BMLoop *BM_edge_vert_share_loop(BMLoop *l, BMVert *v) @@ -2176,7 +2176,7 @@ bool BM_face_exists_multi(BMVert **varr, BMEdge **earr, int len) int i; for (i = 0; i < len; i++) { - /* save some time by looping over edge faces rather then vert faces + /* save some time by looping over edge faces rather than vert faces * will still loop over some faces twice but not as many */ BM_ITER_ELEM (f, &fiter, earr[i], BM_FACES_OF_EDGE) { BM_elem_flag_disable(f, BM_ELEM_INTERNAL_TAG); diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index da1d3df2046..8bdf205babd 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -46,7 +46,7 @@ * * - Walkers use tool flags, not header flags. * - Walkers now use ghash for storing visited elements, - * rather then stealing flags. ghash can be rewritten + * rather than stealing flags. ghash can be rewritten * to be faster if necessary, in the far future :) . * - tools should ALWAYS have necessary error handling * for if walkers fail. diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 88ddac425ee..99be57b7b53 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -636,7 +636,7 @@ static void *bmw_ConnectedVertexWalker_step(BMWalker *walker) * * \note that this doesn't work on non-manifold geometry. * it might be better to rewrite this to extract - * boundary info from the island walker, rather then directly walking + * boundary info from the island walker, rather than directly walking * over the boundary. raises an error if it encounters non-manifold geometry. * * \todo Add restriction flag/callback for wire edges. diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 087cd2cd01f..1c861df0150 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -44,7 +44,7 @@ * this avoids going into an eternal loop if there are many possible branches (see T45582). * - when running into a branch, create a new #PathLinkState state and add to the heap. * - when the target is reached, - * finish - since none of the other paths can be shorter then the one just found. + * finish - since none of the other paths can be shorter than the one just found. * - if the connection can't be found - fail. * - with the connection found, split all edges tagging verts * (or tag verts that sit on the intersection). diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 0789000969e..f38e2e08f33 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -228,7 +228,7 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op) /* tricky feature for making a line/edge from selection history... * - * Rather then do nothing, when 5+ verts are selected, check if they are in our history, + * Rather than do nothing, when 5+ verts are selected, check if they are in our history, * when this is so, we can make edges from them, but _not_ a face, * if it is the intention to make a face the user can just hit F again * since there will be edges next time around. diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index 6986655c6de..c97e855aa67 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -126,7 +126,7 @@ static void bm_loop_pair_from_verts(BMVert *v_a, BMVert *v_b, BMLoop *l_pair[2]) /** * Copy loop pair from one side to the other if either is missing, * this simplifies interpolation code so we only need to check if x/y are missing, - * rather then checking each loop. + * rather than checking each loop. */ static void bm_loop_pair_test_copy(BMLoop *l_pair_a[2], BMLoop *l_pair_b[2]) { diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 3ef5b42b2cd..60c49587387 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -202,7 +202,7 @@ static bool bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_ normal_tri_v3(cross_exist, v->co, co_prev, co_next); normal_tri_v3(cross_optim, optimize_co, co_prev, co_next); - /* use a small value rather then zero so we don't flip a face in multiple steps + /* use a small value rather than zero so we don't flip a face in multiple steps * (first making it zero area, then flipping again) */ if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) { // printf("no flip\n"); |