kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton 2013-08-17 08:21:40 +00:00
parent 85b0315b3b
commit 5fafc222f0
11 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@ -1264,14 +1264,14 @@ void bmesh_print(BMesh *bm)
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 @@ void bmesh_print(BMesh *bm)
}
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);

10
source/blender/bmesh/operators/bmo_dissolve.c
View File

@ -248,7 +248,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op)
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 @@ static bool test_extra_verts(BMesh *bm, BMVert *v)
/* 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;

4
source/blender/bmesh/operators/bmo_extrude.c
View File

@ -163,7 +163,7 @@ void bmo_extrude_edge_only_exec(BMesh *bm, BMOperator *op)
/* 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 @@ void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op)
/* 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);
}
}

2
source/blender/bmesh/operators/bmo_inset.c
View File

@ -84,7 +84,7 @@ void bmo_inset_individual_exec(BMesh *bm, BMOperator *op)
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;

2
source/blender/bmesh/operators/bmo_poke.c
View File

@ -68,7 +68,7 @@ void bmo_poke_exec(BMesh *bm, BMOperator *op)
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;

2
source/blender/bmesh/operators/bmo_symmetrize.c
View File

@ -150,7 +150,7 @@ static void symm_split_asymmetric_edges(Symm *symm)
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];

10
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -428,14 +428,14 @@ static void bev_merge_uvs(BMesh *bm, BMVert *v)
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 @@ static float bevel_limit_offset(BMesh *bm, BevelParams *bp)
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 @@ static float bevel_limit_offset(BMesh *bm, BevelParams *bp)
}
}
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;

2
source/blender/bmesh/tools/bmesh_decimate_dissolve.c
View File

@ -293,7 +293,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, const float angle_limit, const bool
}
/* 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);

10
source/blender/editors/mesh/editmesh_knife.c
View File

@ -308,7 +308,7 @@ static void knife_add_edge_faces_to_vert(KnifeTool_OpData *kcd, KnifeVert *kfv,
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 @@ static KnifeVert *get_bm_knife_vert(KnifeTool_OpData *kcd, BMVert *v)
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 @@ static KnifeEdge *get_bm_knife_edge(KnifeTool_OpData *kcd, BMEdge *e)
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 @@ static ListBase *knife_get_face_kedges(KnifeTool_OpData *kcd, BMFace *f)
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 @@ static void calc_ortho_extent(KnifeTool_OpData *kcd)
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]));
}

2
source/blender/editors/mesh/editmesh_select.c
View File

@ -1234,7 +1234,7 @@ static void mouse_mesh_loop(bContext *C, const int mval[2], bool extend, bool de
/* 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;

2
source/blender/modifiers/intern/MOD_bevel.c
View File

@ -116,7 +116,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
if ((bmd->lim_flags & MOD_BEVEL_VGROUP) && bmd->defgrp_name[0]) {
modifier_get_vgroup(ob, dm, bmd->defgrp_name, &dvert, &vgroup);
}
BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if (!BM_vert_is_manifold(v))
continue;
if (vgroup != -1) {