[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59202] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Aug 17 10:21:41 CEST 2013
Revision: 59202
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59202
Author: campbellbarton
Date: 2013-08-17 08:21:40 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_inset.c
trunk/blender/source/blender/bmesh/operators/bmo_poke.c
trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -1264,14 +1264,14 @@
bm->totloop, bm->totface);
fprintf(stderr, "vertices:\n");
- BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
fprintf(stderr, " %d co=(%.3f %.3f %.3f) oflag=%x\n",
BM_elem_index_get(v), v->co[0], v->co[1], v->co[2],
v->oflags[bm->stackdepth - 1].f);
}
fprintf(stderr, "edges:\n");
- BM_ITER_MESH(e, &iter, bm, BM_EDGES_OF_MESH) {
+ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
fprintf(stderr, " %d v1=%d, v2=%d, oflag=%x\n",
BM_elem_index_get(e),
BM_elem_index_get(e->v1),
@@ -1280,7 +1280,7 @@
}
fprintf(stderr, "faces:\n");
- BM_ITER_MESH(f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
fprintf(stderr, " %d len=%d, oflag=%x\n",
BM_elem_index_get(f), f->len,
f->oflags[bm->stackdepth - 1].f);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -248,7 +248,7 @@
BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
BMIter iter;
int untag_count = 0;
- BM_ITER_ELEM(e, &iter, v, BM_EDGES_OF_VERT) {
+ BM_ITER_ELEM (e, &iter, v, BM_EDGES_OF_VERT) {
if (!BMO_elem_flag_test(bm, e, EDGE_TAG)) {
untag_count++;
}
@@ -310,21 +310,21 @@
/* test faces around verts for verts that would be wrongly killed
* by dissolve faces. */
- BM_ITER_ELEM(f, &fiter, v, BM_FACES_OF_VERT) {
- BM_ITER_ELEM(l, &liter, f, BM_LOOPS_OF_FACE) {
+ BM_ITER_ELEM (f, &fiter, v, BM_FACES_OF_VERT) {
+ BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
if (!BMO_elem_flag_test(bm, l->v, VERT_MARK)) {
/* if an edge around a vert is a boundary edge,
* then dissolve faces won't destroy it.
* also if it forms a boundary with one
* of the face region */
bool found = false;
- BM_ITER_ELEM(e, &eiter, l->v, BM_EDGES_OF_VERT) {
+ BM_ITER_ELEM (e, &eiter, l->v, BM_EDGES_OF_VERT) {
BMFace *f_iter;
if (BM_edge_is_boundary(e)) {
found = true;
}
else {
- BM_ITER_ELEM(f_iter, &fiter_sub, e, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f_iter, &fiter_sub, e, BM_FACES_OF_EDGE) {
if (!BMO_elem_flag_test(bm, f_iter, FACE_MARK)) {
found = true;
break;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -163,7 +163,7 @@
/* disable root flag on all new skin nodes */
if (CustomData_has_layer(&bm->vdata, CD_MVERT_SKIN)) {
BMVert *v;
- BMO_ITER(v, &siter, dupeop.slots_out, "geom.out", BM_VERT) {
+ BMO_ITER (v, &siter, dupeop.slots_out, "geom.out", BM_VERT) {
bm_extrude_disable_skin_root(bm, v);
}
}
@@ -319,7 +319,7 @@
/* disable root flag on all new skin nodes */
if (CustomData_has_layer(&bm->vdata, CD_MVERT_SKIN)) {
- BMO_ITER(v, &siter, dupeop.slots_out, "geom.out", BM_VERT) {
+ BMO_ITER (v, &siter, dupeop.slots_out, "geom.out", BM_VERT) {
bm_extrude_disable_skin_root(bm, v);
}
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_inset.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/operators/bmo_inset.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -84,7 +84,7 @@
BMO_slot_buffer_hflag_enable(bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false);
- BMO_ITER(f, &oiter, op->slots_in, "faces", BM_FACE) {
+ BMO_ITER (f, &oiter, op->slots_in, "faces", BM_FACE) {
BMFace *f_new_inner;
BMLoop *l_iter, *l_first;
BMLoop *l_iter_inner = NULL;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_poke.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_poke.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/operators/bmo_poke.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -68,7 +68,7 @@
break;
}
- BMO_ITER(f, &oiter, op->slots_in, "faces", BM_FACE) {
+ BMO_ITER (f, &oiter, op->slots_in, "faces", BM_FACE) {
BMFace *f_new;
float f_center[3];
BMVert *v_center = NULL;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -150,7 +150,7 @@
BMOIter oiter;
BMEdge *e;
- symm->edge_split_map = BLI_ghash_ptr_new(AT);
+ symm->edge_split_map = BLI_ghash_ptr_new(__func__);
BMO_ITER (e, &oiter, symm->op->slots_in, "input", BM_EDGE) {
float flipped[3];
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -428,14 +428,14 @@
n = 0;
zero_v2(uv);
- BM_ITER_ELEM(l, &iter, v, BM_LOOPS_OF_VERT) {
+ BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
add_v2_v2(uv, luv->uv);
n++;
}
if (n > 1) {
mul_v2_fl(uv, 1.0f / (float)n);
- BM_ITER_ELEM(l, &iter, v, BM_LOOPS_OF_VERT) {
+ BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
copy_v2_v2(luv->uv, uv);
}
@@ -2333,14 +2333,14 @@
bool vbeveled;
limited_offset = bp->offset;
- BM_ITER_MESH(v, &v_iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &v_iter, bm, BM_VERTS_OF_MESH) {
if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
if (bp->vertex_only) {
vbeveled = true;
}
else {
vbeveled = false;
- BM_ITER_ELEM(e, &e_iter, v, BM_EDGES_OF_VERT) {
+ BM_ITER_ELEM (e, &e_iter, v, BM_EDGES_OF_VERT) {
if (BM_elem_flag_test(BM_edge_other_vert(e, v), BM_ELEM_TAG)) {
vbeveled = true;
break;
@@ -2348,7 +2348,7 @@
}
}
if (vbeveled) {
- BM_ITER_ELEM(e, &e_iter, v, BM_EDGES_OF_VERT) {
+ BM_ITER_ELEM (e, &e_iter, v, BM_EDGES_OF_VERT) {
half_elen = 0.5f * BM_edge_calc_length(e);
if (half_elen < limited_offset)
limited_offset = half_elen;
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -293,7 +293,7 @@
}
/* re-calculate costs */
- BM_ITER_ELEM(v_iter, &iter, e_new, BM_VERTS_OF_EDGE) {
+ BM_ITER_ELEM (v_iter, &iter, e_new, BM_VERTS_OF_EDGE) {
const int j = BM_elem_index_get(v_iter);
if (j != -1 && vheap_table[j]) {
const float cost = bm_vert_edge_face_angle(v_iter);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -308,7 +308,7 @@
BMIter bmiter;
BMFace *f;
- BM_ITER_ELEM(f, &bmiter, e, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f, &bmiter, e, BM_FACES_OF_EDGE) {
knife_append_list(kcd, &kfv->faces, f);
}
}
@@ -354,7 +354,7 @@
kfv = new_knife_vert(kcd, v->co, kcd->cagecos[BM_elem_index_get(v)]);
kfv->v = v;
BLI_ghash_insert(kcd->origvertmap, v, kfv);
- BM_ITER_ELEM(f, &bmiter, v, BM_FACES_OF_VERT) {
+ BM_ITER_ELEM (f, &bmiter, v, BM_FACES_OF_VERT) {
knife_append_list(kcd, &kfv->faces, f);
}
}
@@ -379,7 +379,7 @@
BLI_ghash_insert(kcd->origedgemap, e, kfe);
- BM_ITER_ELEM(f, &bmiter, e, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f, &bmiter, e, BM_FACES_OF_EDGE) {
knife_append_list(kcd, &kfe->faces, f);
}
}
@@ -420,7 +420,7 @@
lst = knife_empty_list(kcd);
- BM_ITER_ELEM(e, &bmiter, f, BM_EDGES_OF_FACE) {
+ BM_ITER_ELEM (e, &bmiter, f, BM_EDGES_OF_FACE) {
knife_append_list(kcd, lst, get_bm_knife_edge(kcd, e));
}
@@ -1347,7 +1347,7 @@
float max_xyz = 0.0f;
int i;
- BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
+ BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
for (i = 0; i < 3; i++)
max_xyz = max_ff(max_xyz, fabs(v->co[i]));
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -1234,7 +1234,7 @@
/* We can't be sure this has already been set... */
ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
- BM_ITER_ELEM(f, &iterf, eed, BM_FACES_OF_EDGE) {
+ BM_ITER_ELEM (f, &iterf, eed, BM_FACES_OF_EDGE) {
if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
float cent[3];
float co[2], tdist;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2013-08-17 08:00:22 UTC (rev 59201)
+++ trunk/blender/source/blender/modifiers/intern/MOD_bevel.c 2013-08-17 08:21:40 UTC (rev 59202)
@@ -116,7 +116,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list