diff options
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 22 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 22 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 28 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_private.h | 2 |
12 files changed, 49 insertions, 49 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 804c14747b8..a9e6827676c 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -500,7 +500,7 @@ void BMO_remove_tagged_verts(BMesh *bm, const short oflag) * api functions that take a filter callback..... * and this new filter type will be for opstack flags. * This is because the BM_remove_taggedXXX functions bypass iterator API. - * - Ops dont care about 'UI' considerations like selection state, hide state, ect. + * - Ops don't care about 'UI' considerations like selection state, hide state, ect. * If you want to work on unhidden selections for instance, * copy output from a 'select context' operator to another operator.... */ diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 133e446f891..af87de2ec6f 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1161,7 +1161,7 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, #endif /* validate both loop */ - /* I dont know how many loops are supposed to be in each face at this point! FIXME */ + /* I don't know how many loops are supposed to be in each face at this point! FIXME */ /* go through all of f2's loops and make sure they point to it properly */ l_iter = l_first = BM_FACE_FIRST_LOOP(f2); diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 5b8b537c669..2a3242d87c1 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -633,7 +633,7 @@ void BM_loop_interp_from_face(BMesh *bm, BMLoop *target, BMFace *source, axis_dominant_v3(&ax, &ay, source->no); - /* scale source face coordinates a bit, so points sitting directonly on an + /* scale source face coordinates a bit, so points sitting directly on an * edge will work. */ mul_v3_fl(cent, 1.0f / (float)source->len); for (i = 0; i < source->len; i++) { @@ -696,7 +696,7 @@ void BM_vert_interp_from_face(BMesh *bm, BMVert *v, BMFace *source) i++; } while ((l_iter = l_iter->next) != l_first); - /* scale source face coordinates a bit, so points sitting directonly on an + /* scale source face coordinates a bit, so points sitting directly on an * edge will work. */ mul_v3_fl(cent, 1.0f / (float)source->len); for (i = 0; i < source->len; i++) { diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 89bce16f2ca..a8840cf8938 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -606,7 +606,7 @@ void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese) /* make a fake plane thats at rightangles to the normal * we cant make a crossvec from a vec thats the same as the vec * unlikely but possible, so make sure if the normal is (0, 0, 1) - * that vec isnt the same or in the same direction even. */ + * that vec isn't the same or in the same direction even. */ if (eve->no[0] < 0.5f) vec[0] = 1.0f; else if (eve->no[1] < 0.5f) vec[1] = 1.0f; else vec[2] = 1.0f; @@ -638,7 +638,7 @@ void BM_editselection_plane(BMesh *bm, float r_plane[3], BMEditSelection *ese) /* make a fake plane thats at rightangles to the normal * we cant make a crossvec from a vec thats the same as the vec * unlikely but possible, so make sure if the normal is (0, 0, 1) - * that vec isnt the same or in the same direction even. */ + * that vec isn't the same or in the same direction even. */ if (efa->len < 3) { /* crappy fallback method */ if (efa->no[0] < 0.5f) vec[0] = 1.0f; diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 096c1fabc5e..f69a46e7d8c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -58,7 +58,7 @@ static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize) bm->looplistpool = BLI_mempool_create(sizeof(BMLoopList), allocsize[3], allocsize[3], FALSE, FALSE); #endif - /* allocate one flag pool that we dont get rid of. */ + /* allocate one flag pool that we don't get rid of. */ bm->toolflagpool = BLI_mempool_create(sizeof(BMFlagLayer), 512, 512, 0); } @@ -79,7 +79,7 @@ BMesh *BM_mesh_create(BMAllocTemplate *allocsize) /* allocate the memory pools for the mesh elements */ bm_mempool_init(bm, allocsize); - /* allocate one flag pool that we dont get rid of. */ + /* allocate one flag pool that we don't get rid of. */ bm->stackdepth = 1; bm->totflags = 1; diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 24cb2bc4d5a..b10e25a318c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -251,7 +251,7 @@ void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, int set_key, int act_key_nr) continue; } - /* dont use 'i' since we may have skipped the face */ + /* don't use 'i' since we may have skipped the face */ BM_elem_index_set(f, bm->totface - 1); /* set_ok */ /* transfer flag */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 5248276bae6..2b9387ed73d 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -91,7 +91,7 @@ int BM_vert_dissolve(BMesh *bm, BMVert *v) } } else if (len == 2 && BM_vert_face_count(v) == 1) { - /* boundry vertex on a face */ + /* boundary vertex on a face */ return (BM_vert_collapse_edge(bm, v->e, v, TRUE) != NULL); } else { @@ -540,7 +540,7 @@ BMEdge *BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, else { /* single face or no faces */ /* same as BM_vert_collapse_edge() however we already - * have vars to perform this operation so dont call. */ + * have vars to perform this operation so don't call. */ ne = bmesh_jekv(bm, ke, kv, TRUE); /* ne = BM_edge_exists(tv, tv2); */ /* same as return above */ @@ -801,7 +801,7 @@ int BM_face_validate(BMesh *bm, BMFace *face, FILE *err) * * Examples: * - the newly formed edge already exists - * - the new face would be degenerate (zero area / concav / bow-tie) + * - the new face would be degenerate (zero area / concave / bow-tie) * - may want to measure if the new edge gives improved results topology. * over the old one, as with beauty fill. * @@ -824,8 +824,8 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, BM_edge_ordered_verts(e, &v1, &v2); /* we could swap the verts _or_ the faces, swapping faces - * gives more predictable resuts since that way the next vert - * just sitches from face fa / fb */ + * gives more predictable results since that way the next vert + * just stitches from face fa / fb */ if (ccw) { SWAP(BMFace *, fa, fb); } @@ -833,7 +833,7 @@ void BM_edge_rotate_calc(BMesh *bm, BMEdge *e, int ccw, *r_l1 = BM_face_other_vert_loop(fb, v2, v1); *r_l2 = BM_face_other_vert_loop(fa, v1, v2); - /* when assert isnt used */ + /* when assert isn't used */ (void)bm; } @@ -852,7 +852,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) la = BM_face_other_vert_loop(fa, e->v2, e->v1); lb = BM_face_other_vert_loop(fb, e->v2, e->v1); - /* check that the next vert in both faces isnt the same + /* check that the next vert in both faces isn't the same * (ie - the next edge doesnt share the same faces). * since we can't rotate usefully in this case. */ if (la->v == lb->v) { @@ -879,7 +879,7 @@ int BM_edge_rotate_check(BMesh *UNUSED(bm), BMEdge *e) * * Check 2 cases * 1) does the newly forms edge form a flipped face (compare with previous cross product) - * 2) does the newly formed edge caise a zero area corner (or close enough to be almost zero) + * 2) does the newly formed edge cause a zero area corner (or close enough to be almost zero) * * \param l1,l2 are the loops of the proposed verts to rotate too and should * be the result of calling #BM_edge_rotate_calc @@ -972,7 +972,7 @@ int BM_edge_rotate_check_degenerate(BMesh *bm, BMEdge *e, return TRUE; - /* when assert isnt used */ + /* when assert isn't used */ (void)bm; } @@ -1070,9 +1070,9 @@ BMEdge *BM_edge_rotate(BMesh *bm, BMEdge *e, const short ccw, const short check_ return NULL; } else { - /* we should reallty be able to know the faces some other way, + /* we should really be able to know the faces some other way, * rather then fetching them back from the edge, but this is predictable - * where using the return values from face split isnt. - campbell */ + * where using the return values from face split isn't. - campbell */ BMFace *fa, *fb; if (BM_edge_face_pair(e_new, &fa, &fb)) { fa->head.hflag = f_hflag_prev_1; diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index f2dcaded8ca..1555974eac7 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -93,7 +93,7 @@ /* * Vertex Smooth * - * Smoothes vertices by using a basic vertex averaging scheme. + * Smooths vertices by using a basic vertex averaging scheme. */ static BMOpDefine bmo_vertexsmooth_def = { "vertexsmooth", @@ -740,7 +740,7 @@ static BMOpDefine bmo_split_def = { {BMO_OP_SLOT_MAPPING, "boundarymap"}, {BMO_OP_SLOT_MAPPING, "isovertmap"}, {BMO_OP_SLOT_PNT, "dest"}, /* destination bmesh, if NULL will use current on */ - {BMO_OP_SLOT_BOOL, "use_only_faces"}, /* when enabled. dont duplicate loose verts/edges */ + {BMO_OP_SLOT_BOOL, "use_only_faces"}, /* when enabled. don't duplicate loose verts/edges */ {0} /* null-terminating sentine */}, bmo_split_exec, 0 diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index cc9dfe1701b..341bb877f93 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -482,7 +482,7 @@ int BM_edge_is_manifold(BMesh *UNUSED(bm), BMEdge *e) * of a shell (has one face associated with it) */ -#if 1 /* fast path for checking boundry */ +#if 1 /* fast path for checking boundary */ int BM_edge_is_boundary(BMEdge *e) { const BMLoop *l = e->l; @@ -595,7 +595,7 @@ BMLoop *BM_face_vert_share_loop(BMFace *f, BMVert *v) * Returns the verts of an edge as used in a face * if used in a face at all, otherwise just assign as used in the edge. * - * Useful to get a determanistic winding order when calling + * Useful to get a deterministic winding order when calling * BM_face_create_ngon() on an arbitrary array of verts, * though be sure to pick an edge which has a face. */ @@ -680,7 +680,7 @@ void BM_loop_face_tangent(BMesh *UNUSED(bm), BMLoop *l, float r_tangent[3]) cross_v3_v3v3(r_tangent, dir, nor); } else { - /* prev/next are the same - compare with face normal since we dont have one */ + /* prev/next are the same - compare with face normal since we don't have one */ cross_v3_v3v3(r_tangent, v_next, l->f->no); } @@ -861,7 +861,7 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } } - /* now tag all verts and edges in the boundry array as true so + /* now tag all verts and edges in the boundary array as true so * we can know if a face-vert is from our array */ for (i = 0; i < len; i++) { BM_elem_flag_enable(varr[i], BM_ELEM_INTERNAL_TAG); @@ -869,10 +869,10 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } - /* so! boundry is tagged, everything else cleared */ + /* so! boundary is tagged, everything else cleared */ - /* 1) tag all faces connected to edges - if all their verts are boundry */ + /* 1) tag all faces connected to edges - if all their verts are boundary */ tot_tag = 0; for (i = 0; i < len; i++) { BM_ITER(f, &fiter, bm, BM_FACES_OF_EDGE, earr[i]) { @@ -886,7 +886,7 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } if (ok) { - /* we only use boundry verts */ + /* we only use boundary verts */ BM_elem_flag_enable(f, BM_ELEM_INTERNAL_TAG); tot_tag++; } @@ -898,19 +898,19 @@ int BM_face_exists_multi(BMesh *bm, BMVert **varr, BMEdge **earr, int len) } if (tot_tag == 0) { - /* no faces use only boundry verts, quit early */ + /* no faces use only boundary verts, quit early */ return FALSE; } - /* 2) loop over non-boundry edges that use boundry verts, + /* 2) loop over non-boundary edges that use boundary verts, * check each have 2 tagges faces connected (faces that only use 'varr' verts) */ ok = TRUE; for (i = 0; i < len; i++) { BM_ITER(e, &fiter, bm, BM_EDGES_OF_VERT, varr[i]) { - if (/* non-boundry edge */ + if (/* non-boundary edge */ BM_elem_flag_test(e, BM_ELEM_INTERNAL_TAG) == FALSE && - /* ...using boundry verts */ + /* ...using boundary verts */ BM_elem_flag_test(e->v1, BM_ELEM_INTERNAL_TAG) == TRUE && BM_elem_flag_test(e->v2, BM_ELEM_INTERNAL_TAG) == TRUE) { diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h index 9ea9e332c5f..90f7b36e3a2 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.h +++ b/source/blender/bmesh/intern/bmesh_walkers.h @@ -121,7 +121,7 @@ enum { /* walk over an island of flagged faces. 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 - * over the boundary. raises an error if it encouters nonmanifold + * over the boundary. raises an error if it encounters nonmanifold * geometry. */ BMW_ISLANDBOUND, /* walk over all faces in an island of tool flagged faces. */ diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index b327bf1ef8d..3a5b7120430 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -349,7 +349,7 @@ static void *bmw_IslandWalker_step(BMWalker *walker) l = BM_iter_new(&liter, walker->bm, BM_LOOPS_OF_FACE, iwalk->cur); for ( ; l; l = BM_iter_step(&liter)) { - /* could skip loop here too, but dont add unless we need it */ + /* could skip loop here too, but don't add unless we need it */ if (walker->mask_edge && !BMO_elem_flag_test(walker->bm, l->e, walker->mask_edge)) { continue; } @@ -395,11 +395,11 @@ static void bmw_LoopWalker_begin(BMWalker *walker, void *data) lwalk->cur = lwalk->start = e; lwalk->lastv = lwalk->startv = v; - lwalk->is_boundry = BM_edge_is_boundary(e); + lwalk->is_boundary = BM_edge_is_boundary(e); lwalk->is_single = (vert_edge_count[0] == 2 && vert_edge_count[1] == 2); /* could also check that vertex*/ - if ((lwalk->is_boundry == FALSE) && + if ((lwalk->is_boundary == FALSE) && (vert_edge_count[0] == 3 || vert_edge_count[1] == 3)) { BMIter iter; @@ -472,7 +472,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) lwalk->cur = nexte; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; @@ -492,19 +492,19 @@ static void *bmw_LoopWalker_step(BMWalker *walker) /* typical loopiong over edges in the middle of a mesh */ /* however, why use 2 here at all? I guess for internal ngon loops it can be useful. Antony R. */ - ((vert_edge_tot == 4 || vert_edge_tot == 2) && owalk.is_boundry == FALSE) || + ((vert_edge_tot == 4 || vert_edge_tot == 2) && owalk.is_boundary == FALSE) || - /* walk over boundry of faces but stop at corners */ - (owalk.is_boundry == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || + /* walk over boundary of faces but stop at corners */ + (owalk.is_boundary == TRUE && owalk.is_single == FALSE && vert_edge_tot > 2) || - /* initial edge was a boundry, so is this edge and vertex is only apart of this face - * this lets us walk over the the boundry of an ngon which is handy */ - (owalk.is_boundry == TRUE && owalk.is_single == TRUE && vert_edge_tot == 2 && BM_edge_is_boundary(e))) + /* initial edge was a boundary, so is this edge and vertex is only apart of this face + * this lets us walk over the the boundary of an ngon which is handy */ + (owalk.is_boundary == TRUE && owalk.is_single == TRUE && vert_edge_tot == 2 && BM_edge_is_boundary(e))) { i = 0; stopi = vert_edge_tot / 2; while (1) { - if ((owalk.is_boundry == FALSE) && (i == stopi)) { + if ((owalk.is_boundary == FALSE) && (i == stopi)) { break; } @@ -530,12 +530,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker) if (l != NULL) { if (l != e->l && !BLI_ghash_haskey(walker->visithash, l->e)) { - if (!(owalk.is_boundry == FALSE && i != stopi)) { + if (!(owalk.is_boundary == FALSE && i != stopi)) { lwalk = BMW_state_add(walker); lwalk->cur = l->e; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; @@ -557,7 +557,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) lwalk->cur = nexte; lwalk->lastv = v; - lwalk->is_boundry = owalk.is_boundry; + lwalk->is_boundary = owalk.is_boundary; lwalk->is_single = owalk.is_single; lwalk->f_hub = owalk.f_hub; diff --git a/source/blender/bmesh/intern/bmesh_walkers_private.h b/source/blender/bmesh/intern/bmesh_walkers_private.h index b6c7a974fce..fc563932c3c 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_private.h +++ b/source/blender/bmesh/intern/bmesh_walkers_private.h @@ -62,7 +62,7 @@ typedef struct BMwLoopWalker { BMEdge *cur, *start; BMVert *lastv, *startv; BMFace *f_hub; - short is_boundry; /* boundry looping changes behavior */ + short is_boundary; /* boundary looping changes behavior */ short is_single; /* single means the edge verts are only connected to 1 face */ } BMwLoopWalker; |