diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 15:44:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-19 15:44:12 +0400 |
commit | 75b869e428cdb324ec338538efd4ab9dabd7d53a (patch) | |
tree | 7e47368e70820c4ee08e8b11abfe72eccb2fcb2b /source/blender/bmesh/intern/bmesh_mesh.c | |
parent | db2edfcfdec81fb03667a63e70f05ee832bf2586 (diff) |
style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index c15937abf1d..826d4db4556 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -104,15 +104,15 @@ void BM_mesh_data_free(BMesh *bm) BMIter iter; BMIter itersub; - BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) { CustomData_bmesh_free_block(&(bm->vdata), &(v->head.data)); } - BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) { CustomData_bmesh_free_block(&(bm->edata), &(e->head.data)); } - BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data)); - BM_ITER(l, &itersub, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER (l, &itersub, bm, BM_LOOPS_OF_FACE, f) { CustomData_bmesh_free_block(&(bm->ldata), &(l->head.data)); } } @@ -211,7 +211,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) float (*edgevec)[3]; /* calculate all face normals */ - BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &faces, bm, BM_FACES_OF_MESH, NULL) { if (skip_hidden && BM_elem_flag_test(f, BM_ELEM_HIDDEN)) continue; #if 0 /* UNUSED */ @@ -223,7 +223,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) } /* Zero out vertex normals */ - BM_ITER(v, &verts, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (v, &verts, bm, BM_VERTS_OF_MESH, NULL) { if (skip_hidden && BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; @@ -235,7 +235,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) * normals */ index = 0; edgevec = MEM_callocN(sizeof(float) * 3 * bm->totedge, "BM normal computation array"); - BM_ITER(e, &edges, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (e, &edges, bm, BM_EDGES_OF_MESH, NULL) { BM_elem_index_set(e, index); /* set_inline */ if (e->l) { @@ -251,12 +251,12 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) bm->elem_index_dirty &= ~BM_EDGE; /* add weighted face normals to vertices */ - BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &faces, bm, BM_FACES_OF_MESH, NULL) { if (skip_hidden && BM_elem_flag_test(f, BM_ELEM_HIDDEN)) continue; - BM_ITER(l, &loops, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER (l, &loops, bm, BM_LOOPS_OF_FACE, f) { float *e1diff, *e2diff; float dotprod; float fac; @@ -282,7 +282,7 @@ void BM_mesh_normals_update(BMesh *bm, const short skip_hidden) } /* normalize the accumulated vertex normals */ - BM_ITER(v, &verts, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (v, &verts, bm, BM_VERTS_OF_MESH, NULL) { if (skip_hidden && BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; @@ -312,7 +312,7 @@ static void bm_rationalize_normals(BMesh *bm, int undo) BMIter iter; if (undo) { - BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { if (BM_elem_flag_test(f, BM_ELEM_TAG)) { BM_face_normal_flip(bm, f); } @@ -327,7 +327,7 @@ static void bm_rationalize_normals(BMesh *bm, int undo) BMO_push(bm, &bmop); bmo_righthandfaces_exec(bm, &bmop); - BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { BM_elem_flag_set(f, BM_ELEM_TAG, BMO_elem_flag_test(bm, f, FACE_FLIP)); } @@ -350,10 +350,10 @@ static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from mdisps = CustomData_get_layer(&dm->loopData, CD_MDISPS); - BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (f, &iter, bm, BM_FACES_OF_MESH, NULL) { BMLoop *l; BMIter liter; - BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) { + BM_ITER (l, &liter, bm, BM_LOOPS_OF_FACE, f) { MDisps *lmd = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MDISPS); if (!lmd->disps) { @@ -463,7 +463,7 @@ void BM_mesh_elem_index_ensure(BMesh *bm, const char hflag) if (hflag & BM_VERT) { if (bm->elem_index_dirty & BM_VERT) { int index = 0; - BM_ITER(ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { BM_elem_index_set(ele, index); /* set_ok */ index++; } @@ -478,7 +478,7 @@ void BM_mesh_elem_index_ensure(BMesh *bm, const char hflag) if (hflag & BM_EDGE) { if (bm->elem_index_dirty & BM_EDGE) { int index = 0; - BM_ITER(ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { BM_elem_index_set(ele, index); /* set_ok */ index++; } @@ -493,7 +493,7 @@ void BM_mesh_elem_index_ensure(BMesh *bm, const char hflag) if (hflag & BM_FACE) { if (bm->elem_index_dirty & BM_FACE) { int index = 0; - BM_ITER(ele, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_FACES_OF_MESH, NULL) { BM_elem_index_set(ele, index); /* set_ok */ index++; } @@ -540,7 +540,7 @@ void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char *fu int err_val = 0; int err_idx = 0; - BM_ITER(ele, &iter, bm, iter_types[i], NULL) { + BM_ITER (ele, &iter, bm, iter_types[i], NULL) { if (!is_dirty) { if (BM_elem_index_get(ele) != index) { err_val = BM_elem_index_get(ele); |