diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-27 15:03:10 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-27 15:03:10 +0400 |
commit | 9c9745ef304f0a622de35e2446f062dc0e760a14 (patch) | |
tree | b3c5eab6c3d9a1e5a690649949887727e80c7cc1 /source/blender | |
parent | cd882a446a0508a15e1afe5a4e7ed3fa806d15c0 (diff) |
Fix more truncated comments.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c | 26 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 10 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 30 |
3 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 9a87acbb84f..156725099a8 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -29,7 +29,7 @@ #include "bmesh.h" /* local flag define */ -#define DUPE_INPUT 1 /* input from operato */ +#define DUPE_INPUT 1 /* input from operator */ #define DUPE_NEW 2 #define DUPE_DONE 4 #define DUPE_MAPPED 8 @@ -44,16 +44,16 @@ static BMVert *copy_vertex(BMesh *source_mesh, BMVert *source_vertex, BMesh *tar { BMVert *target_vertex = NULL; - /* Create a new verte */ + /* Create a new vertex */ target_vertex = BM_vert_create(target_mesh, source_vertex->co, NULL); - /* Insert new vertex into the vert has */ + /* Insert new vertex into the vert hash */ BLI_ghash_insert(vhash, source_vertex, target_vertex); - /* Copy attribute */ + /* Copy attributes */ BM_elem_attrs_copy(source_mesh, target_mesh, source_vertex, target_vertex); - /* Set internal op flag */ + /* Set internal op flags */ BMO_elem_flag_enable(target_mesh, target_vertex, DUPE_NEW); return target_vertex; @@ -92,10 +92,10 @@ static BMEdge *copy_edge(BMOperator *op, BMesh *source_mesh, target_vert1 = BLI_ghash_lookup(vhash, source_edge->v1); target_vert2 = BLI_ghash_lookup(vhash, source_edge->v2); - /* Create a new edg */ + /* Create a new edge */ target_edge = BM_edge_create(target_mesh, target_vert1, target_vert2, NULL, FALSE); - /* add to new/old edge map if necassar */ + /* add to new/old edge map if necassary */ if (rlen < 2) { /* not sure what non-manifold cases of greater then three * radial should do. */ @@ -149,7 +149,7 @@ static BMFace *copy_face(BMOperator *op, BMesh *source_mesh, edar[i] = BLI_ghash_lookup(ehash, source_loop->e); } - /* create new fac */ + /* create new face */ target_face = BM_face_create(target_mesh, vtar, edar, source_face->len, FALSE); BMO_slot_map_ptr_insert(source_mesh, op, "facemap", source_face, target_face); @@ -158,10 +158,10 @@ static BMFace *copy_face(BMOperator *op, BMesh *source_mesh, BM_elem_attrs_copy(source_mesh, target_mesh, source_face, target_face); - /* mark the face for outpu */ + /* mark the face for output */ BMO_elem_flag_enable(target_mesh, target_face, DUPE_NEW); - /* copy per-loop custom dat */ + /* copy per-loop custom data */ BM_ITER(source_loop, &iter, source_mesh, BM_LOOPS_OF_FACE, source_face) { BM_ITER(target_loop, &iter2, target_mesh, BM_LOOPS_OF_FACE, target_face) { if (BLI_ghash_lookup(vhash, source_loop->v) == target_loop->v) { @@ -249,7 +249,7 @@ static void copy_mesh(BMOperator *op, BMesh *source, BMesh *target) copy_vertex(source, e->v2, target, vhash); BMO_elem_flag_enable(source, e->v2, DUPE_DONE); } - /* now copy the actual edge*/ + /* now copy the actual edge */ copy_edge(op, source, e, target, vhash, ehash); BMO_elem_flag_enable(source, e, DUPE_DONE); } @@ -258,7 +258,7 @@ static void copy_mesh(BMOperator *op, BMesh *source, BMesh *target) /* first we dupe all flagged faces and their elements from source */ for (f = BM_iter_new(&faces, source, BM_FACES_OF_MESH, source); f; f = BM_iter_step(&faces)) { if (BMO_elem_flag_test(source, f, DUPE_INPUT)) { - /* vertex pas */ + /* vertex pass */ for (v = BM_iter_new(&verts, source, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&verts)) { if (!BMO_elem_flag_test(source, v, DUPE_DONE)) { copy_vertex(source, v, target, vhash); @@ -330,7 +330,7 @@ void bmo_dupe_exec(BMesh *bm, BMOperator *op) /* use the internal copy function */ copy_mesh(dupeop, bm, bm2); - /* Outpu */ + /* Output */ /* First copy the input buffers to output buffers - original data */ BMO_slot_copy(dupeop, dupeop, "geom", "origout"); diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index a97ed6d9dfd..a5e4cd31f41 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -42,7 +42,7 @@ static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op) BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) { v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", l->v); /* ok: if v2 is NULL (e.g. not in the map) then it's - * a target vert, otherwise it's a doubl */ + * a target vert, otherwise it's a double */ if ((v2 && BM_vert_in_face(f, v2)) && (v2 != l->prev->v) && (v2 != l->next->v)) @@ -412,7 +412,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op) BLI_array_free(edges); } -/* uv collapse functio */ +/* uv collapse function */ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) { BMIter iter, liter; @@ -436,7 +436,7 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) { if (BMO_elem_flag_test(bm, l->e, EDGE_MARK)) { - /* wal */ + /* walk */ BLI_array_empty(blocks); tot = 0; l2 = BMW_begin(&walker, l); @@ -453,7 +453,7 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) CustomData_data_multiply(type, &max, 0.5f); CustomData_data_add(type, &min, &max); - /* snap CD (uv, vcol) points to their centroi */ + /* snap CD (uv, vcol) points to their centroid */ for (i = 0; i < tot; i++) { CustomData_data_copy_value(type, &min, blocks[i]); } @@ -499,7 +499,7 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c keepvert = BMO_iter_new(&oiter, bm, op, "keepverts", BM_VERT) != NULL; } - /* sort by vertex coordinates added togethe */ + /* sort by vertex coordinates added together */ qsort(verts, BLI_array_count(verts), sizeof(void *), vergaverco); /* Flag keepverts */ diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index b0dd8778789..f0683d8f49d 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -154,7 +154,7 @@ static void alter_co(BMesh *bm, BMVert *v, BMEdge *UNUSED(origed), const SubDPar mul_v3_v3(vec2, tvec); - /* add displacemen */ + /* add displacement */ add_v3_v3v3(co, co, vec2); } @@ -280,7 +280,7 @@ static void quad_1edge_split(BMesh *bm, BMFace *UNUSED(face), BMFace *nf; int i, add, numcuts = params->numcuts; - /* if it's odd, the middle face is a quad, otherwise it's a triangl */ + /* if it's odd, the middle face is a quad, otherwise it's a triangle */ if ((numcuts % 2) == 0) { add = 2; for (i = 0; i < numcuts; i++) { @@ -734,7 +734,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) patterns[5] = NULL; } - /* add a temporary shapekey layer to store displacements on current geometr */ + /* add a temporary shapekey layer to store displacements on current geometry */ BM_data_layer_add(bmesh, &bmesh->vdata, CD_SHAPEKEY); skey = CustomData_number_of_layers(&bmesh->vdata, CD_SHAPEKEY) - 1; @@ -743,7 +743,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) copy_v3_v3(co, v->co); } - /* first go through and tag edge */ + /* first go through and tag edges */ BMO_slot_buffer_from_flag(bmesh, op, "edges", BM_EDGE, SUBD_SPLIT); params.numcuts = numcuts; @@ -770,7 +770,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) BMEdge *e1 = NULL, *e2 = NULL; float vec1[3], vec2[3]; - /* figure out which pattern to us */ + /* figure out which pattern to use */ BLI_array_empty(edges); BLI_array_empty(verts); @@ -794,7 +794,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) i++; } - /* make sure the two edges have a valid angle to each othe */ + /* make sure the two edges have a valid angle to each other */ if (totesel == 2 && BM_edge_share_vert_count(e1, e2)) { float angle; @@ -834,7 +834,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) } } - /* obvously don't test for other patterns matchin */ + /* obvously don't test for other patterns matching */ continue; } @@ -886,13 +886,13 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) einput = BMO_slot_get(op, "edges"); - /* go through and split edge */ + /* go through and split edges */ for (i = 0; i < einput->len; i++) { edge = ((BMEdge **)einput->data.p)[i]; bm_subdivide_multicut(bmesh, edge, ¶ms, edge->v1, edge->v2); } - /* copy original-geometry displacements to current coordinate */ + /* copy original-geometry displacements to current coordinates */ BM_ITER(v, &viter, bmesh, BM_VERTS_OF_MESH, NULL) { float *co = CustomData_bmesh_get_n(&bmesh->vdata, v->head.data, CD_SHAPEKEY, skey); copy_v3_v3(v->co, co); @@ -902,7 +902,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) for (i = 0; i < BLI_array_count(facedata); i++) { face = facedata[i].face; - /* figure out which pattern to us */ + /* figure out which pattern to use */ BLI_array_empty(verts); pat = facedata[i].pat; @@ -914,7 +914,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) BLI_array_empty(loops); BLI_array_empty(splits); - /* for case of two edges, connecting them shouldn't be too har */ + /* for case of two edges, connecting them shouldn't be too hard */ BM_ITER(l, &liter, bmesh, BM_LOOPS_OF_FACE, face) { BLI_array_growone(loops); loops[BLI_array_count(loops) - 1] = l; @@ -922,7 +922,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) vlen = BLI_array_count(loops); - /* find the boundary of one of the split edge */ + /* find the boundary of one of the split edges */ for (a = 1; a < vlen; a++) { if (!BMO_elem_flag_test(bmesh, loops[a - 1]->v, ELE_INNER) && BMO_elem_flag_test(bmesh, loops[a]->v, ELE_INNER)) @@ -1001,7 +1001,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) pat->connectexec(bmesh, face, verts, ¶ms); } - /* copy original-geometry displacements to current coordinate */ + /* copy original-geometry displacements to current coordinates */ BM_ITER(v, &viter, bmesh, BM_VERTS_OF_MESH, NULL) { float *co = CustomData_bmesh_get_n(&bmesh->vdata, v->head.data, CD_SHAPEKEY, skey); copy_v3_v3(v->co, co); @@ -1021,7 +1021,7 @@ void bmo_esubd_exec(BMesh *bmesh, BMOperator *op) BMO_slot_buffer_from_flag(bmesh, op, "geomout", BM_ALL, ELE_INNER|ELE_SPLIT|SUBD_SPLIT); } -/* editmesh-emulating functio */ +/* editmesh-emulating function */ void BM_mesh_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float smooth, float fractal, int beauty, int numcuts, int seltype, int cornertype, int singleedge, @@ -1101,7 +1101,7 @@ void bmo_edgebisect_exec(BMesh *bm, BMOperator *op) params.origkey = skey; - /* go through and split edge */ + /* go through and split edges */ BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) { bm_subdivide_multicut(bm, e, ¶ms, e->v1, e->v2); } |