[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43967] branches/bmesh/blender/source/ blender: Style Cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 18:42:56 CET 2012
Revision: 43967
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43967
Author: campbellbarton
Date: 2012-02-07 17:42:46 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Style Cleanup:
replace 0/1 with TRUE/FALSE define.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_dupe_ops.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -153,7 +153,7 @@
/*do edges*/
me = medge = dm->dupEdgeArray(dm);
for (i=0; i<totedge; i++, me++) {
- e = BM_Make_Edge(bm, vtable[me->v1], vtable[me->v2], NULL, 0);
+ e = BM_Make_Edge(bm, vtable[me->v1], vtable[me->v2], NULL, FALSE);
e->head.hflag = BM_Edge_Flag_From_MEFlag(me->flag);
@@ -181,7 +181,7 @@
edges[j] = etable[ml->e];
}
- f = BM_Make_Ngon(bm, verts[0], verts[1], edges, mp->totloop, 0);
+ f = BM_Make_Ngon(bm, verts[0], verts[1], edges, mp->totloop, FALSE);
if (!f)
continue;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -174,17 +174,17 @@
/* make new face */
if ((!f) && (!overlap)) {
- if (!edar[0]) edar[0] = BM_Make_Edge(bm, verts[0], verts[1], NULL, 0);
- if (!edar[1]) edar[1] = BM_Make_Edge(bm, verts[1], verts[2], NULL, 0);
+ if (!edar[0]) edar[0] = BM_Make_Edge(bm, verts[0], verts[1], NULL, FALSE);
+ if (!edar[1]) edar[1] = BM_Make_Edge(bm, verts[1], verts[2], NULL, FALSE);
if (len == 4) {
- if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[3], NULL, 0);
- if (!edar[3]) edar[3] = BM_Make_Edge(bm, verts[3], verts[0], NULL, 0);
+ if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[3], NULL, FALSE);
+ if (!edar[3]) edar[3] = BM_Make_Edge(bm, verts[3], verts[0], NULL, FALSE);
}
else {
- if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[0], NULL, 0);
+ if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[0], NULL, FALSE);
}
- f = BM_Make_Face(bm, verts, edar, len, 0);
+ f = BM_Make_Face(bm, verts, edar, len, FALSE);
if (example && f) {
BM_Copy_Attributes(bm, bm, example, f);
@@ -704,8 +704,10 @@
e = BMIter_New(&iter, bmold, BM_EDGES_OF_MESH, NULL);
for (i = 0; e; e = BMIter_Step(&iter), i++) {
- e2 = BM_Make_Edge(bm, vtable[BM_GetIndex(e->v1)],
- vtable[BM_GetIndex(e->v2)], e, 0);
+ e2 = BM_Make_Edge(bm,
+ vtable[BM_GetIndex(e->v1)],
+ vtable[BM_GetIndex(e->v2)],
+ e, FALSE);
BM_Copy_Attributes(bmold, bm, e, e2);
etable[i] = e2;
@@ -741,7 +743,7 @@
v2 = vtable[BM_GetIndex(loops[0]->v)];
}
- f2 = BM_Make_Ngon(bm, v, v2, edges, f->len, 0);
+ f2 = BM_Make_Ngon(bm, v, v2, edges, f->len, FALSE);
if (!f2)
continue;
/* use totface incase adding some faces fails */
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -359,7 +359,7 @@
return;
}
- BMO_InitOpf(bm, &bmop, "righthandfaces faces=%af doflip=%d", 0);
+ BMO_InitOpf(bm, &bmop, "righthandfaces faces=%af doflip=%d", FALSE);
BMO_push(bm, &bmop);
bmesh_righthandfaces_exec(bm, &bmop);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -370,12 +370,12 @@
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
- BM_loop_interp_from_face(bm, l_iter, of, 0, 1);
+ BM_loop_interp_from_face(bm, l_iter, of, FALSE, TRUE);
} while ((l_iter = l_iter->next) != l_first);
l_iter = l_first = BM_FACE_FIRST_LOOP(nf);
do {
- BM_loop_interp_from_face(bm, l_iter, of, 0, 1);
+ BM_loop_interp_from_face(bm, l_iter, of, FALSE, TRUE);
} while ((l_iter = l_iter->next) != l_first);
BM_Kill_Face(bm, of);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -236,7 +236,7 @@
v1 = verts[(i + 1) % f->len];
}
- e = BM_Make_Edge(bm, v1, v2, l_iter->e, 0);
+ e = BM_Make_Edge(bm, v1, v2, l_iter->e, FALSE);
BLI_array_append(edges, e);
}
else {
@@ -246,7 +246,7 @@
i++;
} while ((l_iter = l_iter->next) != l_first);
- f2 = BM_Make_Face(bm, verts, edges, f->len, 0);
+ f2 = BM_Make_Face(bm, verts, edges, f->len, FALSE);
BM_Copy_Attributes(bm, bm, f, f2);
@@ -911,7 +911,7 @@
}
/* create region fac */
- newf = BM_Make_Ngon(bm, v1, v2, edges, tote, 0);
+ newf = BM_Make_Ngon(bm, v1, v2, edges, tote, FALSE);
if (!newf || BMO_HasError(bm)) {
if (!BMO_HasError(bm))
err = "Invalid boundary region to join faces";
@@ -1084,7 +1084,7 @@
}
/* allocate new edge between v1 and v2 */
- e = BM_Make_Edge(bm, v1, v2, NULL, 0);
+ e = BM_Make_Edge(bm, v1, v2, NULL, FALSE);
f2 = bmesh_addpolylist(bm, f);
f1loop = bmesh_create_loop(bm, v2, e, f, v2loop);
@@ -1189,7 +1189,7 @@
valence2 = bmesh_disk_count(tv);
nv = BM_Make_Vert(bm, tv->co, tv);
- ne = BM_Make_Edge(bm, nv, tv, e, 0);
+ ne = BM_Make_Edge(bm, nv, tv, e, FALSE);
bmesh_disk_remove_edge(ne, tv);
bmesh_disk_remove_edge(ne, nv);
@@ -1835,7 +1835,7 @@
e->l = cutl->radial_next;
}
- ne = BM_Make_Edge(bm, e->v1, e->v2, e, 0);
+ ne = BM_Make_Edge(bm, e->v1, e->v2, e, FALSE);
bmesh_radial_remove_loop(cutl, e);
bmesh_radial_append(ne, cutl);
cutl->e = ne;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/intern/editmesh_to_bmesh.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -170,7 +170,7 @@
v1 = eed->v1->tmp.p;
v2 = eed->v2->tmp.p;
- e = BM_Make_Edge(bm, v1, v2,NULL, 0);
+ e = BM_Make_Edge(bm, v1, v2,NULL, FALSE);
editedge_to_BMEdge_internal(bm, op, em, e, eed);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -206,7 +206,7 @@
BMEdge *edges[2] = {e, BM_Make_Edge(bm, e->v1, e->v2, e, 0)};
BMO_SetFlag(bm, edges[1], BEVEL_FLAG);
- BM_Make_Face(bm, verts, edges, 2, 0);
+ BM_Make_Face(bm, verts, edges, 2, FALSE);
}
#endif
}
@@ -431,7 +431,7 @@
firstv = tag->newv;
if (lastv) {
- e = BM_Make_Edge(bm, lastv, tag->newv, l->e, 1);
+ e = BM_Make_Edge(bm, lastv, tag->newv, l->e, TRUE);
BM_Copy_Attributes(bm, bm, l->prev->e, e);
BLI_array_append(edges, e);
}
@@ -443,7 +443,7 @@
if (!BMO_TestFlag(bm, l->e, BEVEL_FLAG) && v2 && v2 != tag->newv) {
BLI_array_append(verts, v2);
- e = BM_Make_Edge(bm, lastv, v2, l->e, 1);
+ e = BM_Make_Edge(bm, lastv, v2, l->e, TRUE);
BM_Copy_Attributes(bm, bm, l->e, e);
BLI_array_append(edges, e);
@@ -451,13 +451,13 @@
}
}
- e = BM_Make_Edge(bm, firstv, lastv, BM_FACE_FIRST_LOOP(faces[i])->e, 1);
+ e = BM_Make_Edge(bm, firstv, lastv, BM_FACE_FIRST_LOOP(faces[i])->e, TRUE);
if (BM_FACE_FIRST_LOOP(faces[i])->prev->e != e) {
BM_Copy_Attributes(bm, bm, BM_FACE_FIRST_LOOP(faces[i])->prev->e, e);
}
BLI_array_append(edges, e);
- f = BM_Make_Ngon(bm, verts[0], verts[1], edges, BLI_array_count(edges), 0);
+ f = BM_Make_Ngon(bm, verts[0], verts[1], edges, BLI_array_count(edges), FALSE);
if (!f) {
printf("%s: could not make face!\n", __func__);
continue;
@@ -529,7 +529,7 @@
BMEdge *e1, *e2;
float d1, d2, *d3;
- f = BM_Make_Face_QuadTri(bm, v4, v3, v2, v1, l->f, 1);
+ f = BM_Make_Face_QuadTri(bm, v4, v3, v2, v1, l->f, TRUE);
e1 = BM_Edge_Exist(v4, v3);
e2 = BM_Edge_Exist(v2, v1);
@@ -737,7 +737,7 @@
} while (vv != vstart);
if (!err) {
- e = BM_Make_Edge(bm, vv, vstart, NULL, 1);
+ e = BM_Make_Edge(bm, vv, vstart, NULL, TRUE);
BLI_array_append(edges, e);
}
}
@@ -751,7 +751,7 @@
if (BM_Face_Exists(bm, verts, BLI_array_count(verts), &f))
continue;
- f = BM_Make_Ngon(bm, lastv, vstart, edges, BLI_array_count(edges), 0);
+ f = BM_Make_Ngon(bm, lastv, vstart, edges, BLI_array_count(edges), FALSE);
if (!f) {
fprintf(stderr, "%s: in bevel vert fill! (bmesh internal error)\n", __func__);
}
@@ -782,7 +782,7 @@
if (tag->newv != l->v || HasMDisps) {
BM_Copy_Attributes(bm, bm, l->f, l2->f);
- BM_loop_interp_from_face(bm, l2, l->f, 1, 1);
+ BM_loop_interp_from_face(bm, l2, l->f, TRUE, TRUE);
}
else {
BM_Copy_Attributes(bm, bm, l->f, l2->f);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c 2012-02-07 17:32:01 UTC (rev 43966)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c 2012-02-07 17:42:46 UTC (rev 43967)
@@ -95,7 +95,7 @@
target_vert2 = BLI_ghash_lookup(vhash, source_edge->v2);
/* Create a new edg */
- target_edge = BM_Make_Edge(target_mesh, target_vert1, target_vert2, NULL, 0);
+ target_edge = BM_Make_Edge(target_mesh, target_vert1, target_vert2, NULL, FALSE);
/* add to new/old edge map if necassar */
if (rlen < 2) {
@@ -152,7 +152,7 @@
}
/* create new fac */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list