diff options
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/bmesh_class.h | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_inline.h | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 12 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_query.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_bridge.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_normals.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide_edgering.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bisect_plane.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 6 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_wireframe.c | 2 |
13 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index c83fc0645c4..f60fc72f8a9 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -24,7 +24,7 @@ */ /* disable holes for now, - * these are ifdef'd because they use more memory and cant be saved in DNA currently */ + * these are ifdef'd because they use more memory and can't be saved in DNA currently */ // #define USE_BMESH_HOLES struct BMEdge; @@ -346,7 +346,7 @@ typedef struct BMesh { /* Should be copy of scene select mode. */ /* Stored in #BMEditMesh too, this is a bit confusing, * make sure they're in sync! - * Only use when the edit mesh cant be accessed - campbell */ + * Only use when the edit mesh can't be accessed - campbell */ short selectmode; /* ID of the shape key this bmesh came from */ diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 3eab252df7a..f79f1925560 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -673,7 +673,7 @@ BMesh *BM_mesh_copy(BMesh *bm_old) ftable = MEM_mallocN(sizeof(BMFace *) * bm_old->totface, "BM_mesh_copy ftable"); BM_ITER_MESH_INDEX (v, &iter, bm_old, BM_VERTS_OF_MESH, i) { - /* copy between meshes so cant use 'example' argument */ + /* copy between meshes so can't use 'example' argument */ v_new = BM_vert_create(bm_new, v->co, NULL, BM_CREATE_SKIP_CD); BM_elem_attrs_copy_ex(bm_old, bm_new, v, v_new, 0xff, 0x0); v_new->head.hflag = v->head.hflag; /* low level! don't do this for normal api use */ diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h index 2888d7e7526..4350b4d04ed 100644 --- a/source/blender/bmesh/intern/bmesh_inline.h +++ b/source/blender/bmesh/intern/bmesh_inline.h @@ -95,7 +95,7 @@ BLI_INLINE void _bm_elem_flag_merge_into(BMHeader *head, /** * notes on #BM_elem_index_set(...) usage, - * Set index is sometimes abused as temp storage, other times we cant be + * Set index is sometimes abused as temp storage, other times we can't be * sure if the index values are valid because certain operations have modified * the mesh structure. * diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index d0c6bc83088..80028564ff2 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -840,8 +840,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMVert **verts_pool, *verts_copy, **vep; int i, totvert = bm->totvert; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_vert_pyptr = CustomData_get_offset(&bm->vdata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ @@ -892,8 +892,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMEdge **edges_pool, *edges_copy, **edp; int i, totedge = bm->totedge; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_edge_pyptr = CustomData_get_offset(&bm->edata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ @@ -943,8 +943,8 @@ void BM_mesh_remap(BMesh *bm, const uint *vert_idx, const uint *edge_idx, const BMFace **faces_pool, *faces_copy, **fap; int i, totface = bm->totface; const uint *new_idx; - /* Special case: Python uses custom - data layers to hold PyObject references. - * These have to be kept in - place, else the PyObject's we point to, wont point back to us. */ + /* Special case: Python uses custom data layers to hold PyObject references. + * These have to be kept in place, else the PyObjects we point to, won't point back to us. */ const int cd_poly_pyptr = CustomData_get_offset(&bm->pdata, CD_BM_ELEM_PYPTR); /* Init the old-to-new vert pointers mapping */ diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 76e32667804..548dba242bf 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -46,7 +46,7 @@ * </pre> * * This function can also collapse edges too - * in cases when it cant merge into faces. + * in cases when it can't merge into faces. * * \par Example: * <pre> diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 03655bccf1c..da407abfb21 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -699,7 +699,7 @@ BMEdge *BM_vert_other_disk_edge(BMVert *v, BMEdge *e_first) if (BM_edge_is_manifold(l_a->e)) { l_a = l_a->radial_next; } - /* this wont have changed from the previous loop */ + /* this won't have changed from the previous loop */ i++; } while (l_a != e_first->l); @@ -978,7 +978,7 @@ bool BM_vert_is_manifold(const BMVert *v) /* start at the boundary */ l_first = e_iter->l; boundary_num += 1; - /* >2 boundaries cant be manifold */ + /* >2 boundaries can't be manifold */ if (boundary_num == 3) { return false; } diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 5713c17e146..0a6540c0e5e 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -236,7 +236,7 @@ static void bridge_loop_pair(BMesh *bm, if (UNLIKELY((len_squared_v3(el_dir) < eps) || ((fabsf(dot_a) < eps) && (fabsf(dot_b) < eps)))) { /* in this case there is no depth between the two loops, * eg: 2x 2d circles, one scaled smaller, - * in this case 'el_dir' cant be used, just ensure we have matching flipping. */ + * in this case 'el_dir' can't be used, just ensure we have matching flipping. */ if (dot_v3v3(BM_edgeloop_normal_get(el_store_a), BM_edgeloop_normal_get(el_store_b)) < 0.0f) { BM_edgeloop_flip(bm, el_store_b); } diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c index 3311ffefb0d..b5f5e5e308b 100644 --- a/source/blender/bmesh/operators/bmo_normals.c +++ b/source/blender/bmesh/operators/bmo_normals.c @@ -138,7 +138,7 @@ static int recalc_face_normals_find_index(BMesh *bm, * then the outer-most loop attached to that vertex. * * Important this is correctly detected, - * where casting a ray from the center wont hit any loops past this one. + * where casting a ray from the center won't hit any loops past this one. * Otherwise the result may be incorrect. */ for (i = 0; i < faces_len; i++) { diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index 38a27b811b0..16d7b79a028 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -244,7 +244,7 @@ static GSet *bm_edgering_pair_calc(BMesh *bm, ListBase *eloops_rim) el_store_other = BLI_ghash_lookup(vert_eloop_gh, v_other); - /* in rare cases we cant find a match */ + /* in rare cases we can't find a match */ if (el_store_other) { pair_test.first = el_store; pair_test.second = el_store_other; diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index e7d0fe6a0c6..8f03b86b859 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -368,7 +368,7 @@ static void bm_face_bisect_verts( } } - /* Ideally wont happen, but it can for self intersecting faces. */ + /* Ideally won't happen, but it can for self-intersecting faces. */ // BLI_assert(found == true); /* In fact this simple test is good enough, test if the loops are adjacent. */ diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index bc497c38e7a..82878c7618a 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -1372,7 +1372,7 @@ void BM_mesh_decimate_collapse(BMesh *bm, /* handy to detect corruptions elsewhere */ BLI_assert(BM_elem_index_get(e) < tot_edge_orig); - /* Under normal conditions wont be accessed again, + /* Under normal conditions won't be accessed again, * but NULL just in case so we don't use freed node. */ eheap_table[BM_elem_index_get(e)] = NULL; diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 710d7f79637..cc980a81aad 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -560,8 +560,8 @@ static void bm_isect_tri_tri( /* vert-vert * --------- */ { - /* first check in any verts are touching - * (any case where we wont create new verts) + /* first check if any verts are touching + * (any case where we won't create new verts) */ uint i_a; for (i_a = 0; i_a < 3; i_a++) { @@ -1606,7 +1606,7 @@ bool BM_mesh_intersect(BMesh *bm, for (node = s.vert_dissolve; node; node = node->next) { BMVert *v = node->link; if (BM_vert_is_edge_pair(v)) { - /* we wont create degenerate faces from this */ + /* we won't create degenerate faces from this */ bool ok = true; /* would we create a 2-sided-face? diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c index 1c820db74f4..a3db93be033 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.c +++ b/source/blender/bmesh/tools/bmesh_wireframe.c @@ -63,7 +63,7 @@ static void bm_vert_boundary_tangent( float tvec_a[3], tvec_b[3]; /* get 2 boundary edges, there should only _be_ 2, - * in case there are more - results wont be valid of course */ + * in case there are more - results won't be valid of course */ BM_ITER_ELEM (e_iter, &iter, v, BM_EDGES_OF_VERT) { if (BM_elem_flag_test(e_iter, BM_ELEM_TAG)) { if (e_a == NULL) { |