[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45213] trunk/blender/source/blender/bmesh /operators: Fix more truncated comments.
Nicholas Bishop
nicholasbishop at gmail.com
Tue Mar 27 13:03:11 CEST 2012
Revision: 45213
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45213
Author: nicholasbishop
Date: 2012-03-27 11:03:10 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Fix more truncated comments.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-27 10:55:20 UTC (rev 45212)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-27 11:03:10 UTC (rev 45213)
@@ -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 @@
{
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 @@
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 @@
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 @@
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 @@
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 @@
/* 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 @@
/* 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");
Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-27 10:55:20 UTC (rev 45212)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-27 11:03:10 UTC (rev 45213)
@@ -42,7 +42,7 @@
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 @@
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 @@
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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-27 10:55:20 UTC (rev 45212)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-27 11:03:10 UTC (rev 45213)
@@ -154,7 +154,7 @@
mul_v3_v3(vec2, tvec);
- /* add displacemen */
+ /* add displacement */
add_v3_v3v3(co, co, vec2);
}
@@ -280,7 +280,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- /* obvously don't test for other patterns matchin */
+ /* obvously don't test for other patterns matching */
continue;
}
@@ -886,13 +886,13 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
More information about the Bf-blender-cvs
mailing list