[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52879] trunk/blender/source/blender/bmesh : own cleanup commit in bmesh branch - removed last letters from ends of some comments .
Campbell Barton
ideasman42 at gmail.com
Tue Dec 11 15:24:27 CET 2012
Revision: 52879
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52879
Author: campbellbarton
Date: 2012-12-11 14:24:27 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
own cleanup commit in bmesh branch - removed last letters from ends of some comments.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-12-11 14:21:52 UTC (rev 52878)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-12-11 14:24:27 UTC (rev 52879)
@@ -78,7 +78,7 @@
copy_v3_v3(v->co, co);
}
- /* allocate flag */
+ /* allocate flags */
if (bm->toolflagpool) {
v->oflags = BLI_mempool_calloc(bm->toolflagpool);
}
@@ -132,7 +132,7 @@
e->head.htype = BM_EDGE;
- /* allocate flag */
+ /* allocate flags */
if (bm->toolflagpool) {
e->oflags = BLI_mempool_calloc(bm->toolflagpool);
}
@@ -295,7 +295,7 @@
f->head.htype = BM_FACE;
- /* allocate flag */
+ /* allocate flags */
if (bm->toolflagpool) {
f->oflags = BLI_mempool_calloc(bm->toolflagpool);
}
@@ -321,7 +321,7 @@
int i, overlap;
if (len == 0) {
- /* just return NULL for no */
+ /* just return NULL for now */
return NULL;
}
@@ -814,11 +814,11 @@
}
}
}
- /* rebuild radia */
+ /* rebuild radial */
for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next)
bmesh_radial_append(l_iter->e, l_iter);
- /* validate radia */
+ /* validate radial */
for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next) {
BM_CHECK_ELEMENT(l_iter);
BM_CHECK_ELEMENT(l_iter->e);
@@ -1068,7 +1068,7 @@
} while (l2 != l_iter);
if (l2 != l_iter) {
- /* I think this is correct */
+ /* I think this is correct? */
if (l2->v != l_iter->v) {
l2 = l2->next;
}
@@ -1080,7 +1080,7 @@
BM_elem_attrs_copy(bm, bm, faces[0], newf);
#ifdef USE_BMESH_HOLES
- /* add hole */
+ /* add holes */
BLI_movelisttolist(&newf->loops, &holes);
#endif
@@ -1396,7 +1396,7 @@
/* add ne to tv's disk cycle */
bmesh_disk_edge_append(ne, tv);
- /* verify disk cycle */
+ /* verify disk cycles */
edok = bmesh_disk_validate(valence1, ov->e, ov);
BMESH_ASSERT(edok != FALSE);
edok = bmesh_disk_validate(valence2, tv->e, tv);
@@ -1483,7 +1483,7 @@
BMESH_ASSERT(l->v != l->next->v);
BMESH_ASSERT(l->e != l->next->e);
- /* verify loop cycle for kloop-> */
+ /* verify loop cycle for kloop->f */
BM_CHECK_ELEMENT(l);
BM_CHECK_ELEMENT(l->v);
BM_CHECK_ELEMENT(l->e);
@@ -1564,7 +1564,7 @@
oe = bmesh_disk_edge_next(ke, kv);
tv = bmesh_edge_other_vert_get(ke, kv);
ov = bmesh_edge_other_vert_get(oe, kv);
- halt = bmesh_verts_in_edge(kv, tv, oe); /* check for double edge */
+ halt = bmesh_verts_in_edge(kv, tv, oe); /* check for double edges */
if (halt) {
return NULL;
@@ -1572,7 +1572,7 @@
else {
BMEdge *e_splice;
- /* For verification later, count valence of ov and t */
+ /* For verification later, count valence of ov and tv */
valence1 = bmesh_disk_count(ov);
valence2 = bmesh_disk_count(tv);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-12-11 14:21:52 UTC (rev 52878)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-12-11 14:24:27 UTC (rev 52879)
@@ -152,14 +152,14 @@
return TRUE;
}
else if (keepedge == NULL && len == 2) {
- /* collapse the verte */
+ /* collapse the vertex */
e = BM_vert_collapse_faces(bm, v->e, v, 1.0, TRUE, TRUE);
if (!e) {
return FALSE;
}
- /* handle two-valenc */
+ /* handle two-valence */
f = e->l->f;
f2 = e->l->radial_next->f;
@@ -205,12 +205,12 @@
return FALSE;
}
- /* get remaining two face */
+ /* get remaining two faces */
f = e->l->f;
f2 = e->l->radial_next->f;
if (f != f2) {
- /* join two remaining face */
+ /* join two remaining faces */
if (!BM_faces_join_pair(bm, f, f2, e, TRUE)) {
return FALSE;
}
@@ -343,7 +343,7 @@
BLI_assert(v1 != v2);
- /* do we have a multires layer */
+ /* do we have a multires layer? */
if (has_mdisp) {
of = BM_face_copy(bm, f, FALSE, FALSE);
}
@@ -649,7 +649,7 @@
r_e = &e_dummy;
}
- /* do we have a multi-res layer */
+ /* do we have a multi-res layer? */
if (do_mdisp) {
BMLoop *l;
int i;
@@ -689,7 +689,7 @@
if (do_mdisp) {
int i, j;
- /* interpolate new/changed loop data from copied old face */
+ /* interpolate new/changed loop data from copied old faces */
for (j = 0; j < 2; j++) {
for (i = 0; i < BLI_array_count(oldfaces); i++) {
BMEdge *e1 = j ? *r_e : e;
@@ -716,7 +716,7 @@
}
}
- /* destroy the old face */
+ /* destroy the old faces */
for (i = 0; i < BLI_array_count(oldfaces); i++) {
BM_face_verts_kill(bm, oldfaces[i]);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-12-11 14:21:52 UTC (rev 52878)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-12-11 14:24:27 UTC (rev 52879)
@@ -339,7 +339,7 @@
static BMOpDefine bmo_collapse_def = {
"collapse",
/* slots_in */
- {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edge */
+ {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
{{'\0'}},
},
{{{'\0'}}}, /* no output */
@@ -374,7 +374,7 @@
static BMOpDefine bmo_average_vert_facedata_def = {
"average_vert_facedata",
/* slots_in */
- {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertice */
+ {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */
{{'\0'}},
},
{{{'\0'}}}, /* no output */
@@ -390,7 +390,7 @@
static BMOpDefine bmo_pointmerge_def = {
"pointmerge",
/* slots_in */
- {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertice */
+ {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */
{"merge_co", BMO_OP_SLOT_VEC},
{{'\0'}},
},
@@ -407,7 +407,7 @@
static BMOpDefine bmo_collapse_uvs_def = {
"collapse_uvs",
/* slots_in */
- {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edge */
+ {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
{{'\0'}},
},
{{{'\0'}}}, /* no output */
@@ -513,7 +513,7 @@
static BMOpDefine bmo_bridge_loops_def = {
"bridge_loops",
/* slots_in */
- {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edge */
+ {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
{"use_merge", BMO_OP_SLOT_BOOL},
{"merge_factor", BMO_OP_SLOT_FLT},
{{'\0'}},
@@ -534,7 +534,7 @@
static BMOpDefine bmo_edgenet_fill_def = {
"edgenet_fill",
/* slots_in */
- {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edge */
+ {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
/* restricts edges to groups. maps edges to integer */
{"restrict", BMO_OP_SLOT_MAPPING, {BMO_OP_SLOT_SUBTYPE_MAP_BOOL}},
{"use_restrict", BMO_OP_SLOT_BOOL},
@@ -547,7 +547,7 @@
/* slots_out */
/* maps new faces to the group numbers they came from */
{{"face_groupmap.out", BMO_OP_SLOT_MAPPING, {BMO_OP_SLOT_SUBTYPE_MAP_ELEM}},
- {"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* new face */
+ {"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* new faces */
{{'\0'}},
},
bmo_edgenet_fill_exec,
@@ -962,7 +962,7 @@
{/* these next three can have multiple types of elements in them */
{"geom_inner.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}},
{"geom_split.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}},
- {"geom.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}}, /* contains all output geometr */
+ {"geom.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT | BM_EDGE | BM_FACE}}, /* contains all output geometry */
{{'\0'}},
},
bmo_subdivide_edges_exec,
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-12-11 14:21:52 UTC (rev 52878)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-12-11 14:24:27 UTC (rev 52879)
@@ -1176,7 +1176,7 @@
bm->totflags++;
- /* allocate new flag poo */
+ /* allocate new flag pool */
bm->toolflagpool = newpool = BLI_mempool_create(sizeof(BMFlagLayer) * bm->totflags, 512, 512, 0);
/* now go through and memcpy all the flags. Loops don't get a flag layer at this time.. */
@@ -1224,10 +1224,10 @@
/* de-increment the totflags first.. */
bm->totflags--;
- /* allocate new flag poo */
+ /* allocate new flag pool */
bm->toolflagpool = newpool = BLI_mempool_create(new_totflags_size, 512, 512, 0);
- /* now go through and memcpy all the flag */
+ /* now go through and memcpy all the flags */
BM_ITER_MESH_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, i) {
oldflags = ele->oflags;
ele->oflags = BLI_mempool_calloc(newpool);
@@ -1265,7 +1265,7 @@
BMIter iter;
const int totflags_offset = bm->totflags - 1;
- /* now go through and memcpy all the flag */
+ /* now go through and memcpy all the flags */
BM_ITER_MESH_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, i) {
memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer));
BM_elem_index_set(ele, i); /* set_inline */
@@ -1364,7 +1364,7 @@
return NULL;
}
-/* used for iterating over mapping */
+/* used for iterating over mappings */
void *BMO_iter_map_value(BMOIter *iter)
{
return iter->val;
@@ -1380,7 +1380,7 @@
return *((float *)iter->val);
}
-/* error syste */
+/* error system */
typedef struct BMOpError {
struct BMOpError *next, *prev;
int errorcode;
@@ -1562,7 +1562,7 @@
goto error; \
} (void)0
- /* we muck around in here, so dup i */
+ /* we muck around in here, so dup it */
fmt = ofmt = BLI_strdup(_fmt);
/* find operator name */
@@ -1589,11 +1589,11 @@
while (*fmt) {
if (state) {
- /* jump past leading whitespac */
+ /* jump past leading whitespace */
i = strspn(fmt, " ");
fmt += i;
- /* ignore trailing whitespac */
+ /* ignore trailing whitespace */
if (!fmt[i])
break;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-12-11 14:21:52 UTC (rev 52878)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-12-11 14:24:27 UTC (rev 52879)
@@ -1042,7 +1042,7 @@
}
}
- /* do line crossing test */
+ /* do line crossing tests */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list