Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-19 15:44:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-19 15:44:12 +0400
commit75b869e428cdb324ec338538efd4ab9dabd7d53a (patch)
tree7e47368e70820c4ee08e8b11abfe72eccb2fcb2b /source/blender/modifiers/intern
parentdb2edfcfdec81fb03667a63e70f05ee832bf2586 (diff)
style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r--source/blender/modifiers/intern/MOD_array.c16
-rw-r--r--source/blender/modifiers/intern/MOD_bevel.c4
-rw-r--r--source/blender/modifiers/intern/MOD_edgesplit.c4
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index ead657aaf24..8a3c730385b 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -179,12 +179,12 @@ static int *find_doubles_index_map(BMesh *bm, BMOperator *dupe_op,
BMO_op_exec(bm, &find_op);
i = 0;
- BMO_ITER(ele, &oiter, bm, dupe_op, "geom", BM_ALL) {
+ BMO_ITER (ele, &oiter, bm, dupe_op, "geom", BM_ALL) {
BM_elem_index_set(ele, i); /* set_dirty */
i++;
}
- BMO_ITER(ele, &oiter, bm, dupe_op, "newout", BM_ALL) {
+ BMO_ITER (ele, &oiter, bm, dupe_op, "newout", BM_ALL) {
BM_elem_index_set(ele, i); /* set_dirty */
i++;
}
@@ -196,7 +196,7 @@ static int *find_doubles_index_map(BMesh *bm, BMOperator *dupe_op,
index_map = MEM_callocN(sizeof(int) * (*index_map_length), "index_map");
/*element type argument doesn't do anything here*/
- BMO_ITER(v, &oiter, bm, &find_op, "targetmapout", 0) {
+ BMO_ITER (v, &oiter, bm, &find_op, "targetmapout", 0) {
v2 = BMO_iter_map_value_p(&oiter);
index_map[BM_elem_index_get(v)] = BM_elem_index_get(v2) + 1;
@@ -240,7 +240,7 @@ static void bm_merge_dm_transform(BMesh* bm, DerivedMesh *dm, float mat[4][4],
BMO_slot_buffer_append(&find_op, "verts", dupe_op, dupe_slot_name);
/* transform and tag verts */
- BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
if (!BM_elem_flag_test(v, BM_ELEM_TAG)) {
mul_m4_v3(mat, v->co);
BM_elem_flag_enable(v, BM_ELEM_TAG);
@@ -250,7 +250,7 @@ static void bm_merge_dm_transform(BMesh* bm, DerivedMesh *dm, float mat[4][4],
BMO_op_exec(bm, &find_op);
/* add new merge targets to weld operator */
- BMO_ITER(v, &oiter, bm, &find_op, "targetmapout", 0) {
+ BMO_ITER (v, &oiter, bm, &find_op, "targetmapout", 0) {
v2 = BMO_iter_map_value_p(&oiter);
BMO_slot_map_ptr_insert(bm, weld_op, "targetmap", v, v2);
}
@@ -259,7 +259,7 @@ static void bm_merge_dm_transform(BMesh* bm, DerivedMesh *dm, float mat[4][4],
}
else {
/* transform and tag verts */
- BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER (v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
if (!BM_elem_flag_test(v, BM_ELEM_TAG)) {
mul_m4_v3(mat, v->co);
BM_elem_flag_enable(v, BM_ELEM_TAG);
@@ -289,7 +289,7 @@ static void merge_first_last(BMesh* bm,
BMO_op_exec(bm, &find_op);
/* add new merge targets to weld operator */
- BMO_ITER(v, &oiter, bm, &find_op, "targetmapout", 0) {
+ BMO_ITER (v, &oiter, bm, &find_op, "targetmapout", 0) {
v2 = BMO_iter_map_value_p(&oiter);
BMO_slot_map_ptr_insert(bm, weld_op, "targetmap", v, v2);
}
@@ -432,7 +432,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
}
/* apply transformation matrix */
- BMO_ITER(v, &oiter, em->bm, &dupe_op, "newout", BM_VERT) {
+ BMO_ITER (v, &oiter, em->bm, &dupe_op, "newout", BM_VERT) {
mul_m4_v3(offset, v->co);
}
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 57634627cee..ef728477408 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -125,7 +125,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *UNUSED(ob),
BMO_push(bm, NULL);
if (bmd->lim_flags & BME_BEVEL_ANGLE) {
- BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+ BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
/* check for 1 edge having 2 face users */
BMLoop *l1, *l2;
if ( (l1= e->l) &&
@@ -139,7 +139,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *UNUSED(ob),
}
else {
/* crummy, is there a way just to operator on all? - campbell */
- BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+ BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
BMO_elem_flag_enable(bm, e, EDGE_MARK);
}
}
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 6ffacba3b68..38ed2fbe801 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -73,7 +73,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj
BMO_push(bm, NULL);
if (emd->flags & MOD_EDGESPLIT_FROMANGLE) {
- BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+ BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
/* check for 1 edge having 2 face users */
BMLoop *l1, *l2;
if ( (l1= e->l) &&
@@ -87,7 +87,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj
}
if (emd->flags & MOD_EDGESPLIT_FROMFLAG) {
- BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
+ BM_ITER (e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
/* check for 2 or more edge users */
if ((e->l) &&
(e->l->next != e->l))