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_operators.c | |
parent | db2edfcfdec81fb03667a63e70f05ee832bf2586 (diff) |
style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index a1cdcc65f1c..32abaf10f64 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -473,7 +473,7 @@ static int bmo_mesh_flag_count(BMesh *bm, const char htype, const short oflag, for (i = 0; i < 3; i++) { if (htype & flag_types[i]) { - BM_ITER(ele_f, &iter, bm, iter_types[i], NULL) { + BM_ITER (ele_f, &iter, bm, iter_types[i], NULL) { if (BMO_elem_flag_test_bool(bm, ele_f, oflag) == test_for_enabled) count++; } @@ -508,7 +508,7 @@ void BMO_mesh_flag_disable_all(BMesh *bm, BMOperator *UNUSED(op), const char hty for (i = 0; i < 3; i++) { if (htype & flag_types[i]) { - BM_ITER(ele, &iter, bm, iter_types[i], NULL) { + BM_ITER (ele, &iter, bm, iter_types[i], NULL) { BMO_elem_flag_disable(bm, ele, oflag); } } @@ -663,21 +663,21 @@ static void BMO_slot_buffer_from_all(BMesh *bm, BMOperator *op, const char *slot /* TODO - collapse these loops into one */ if (htype & BM_VERT) { - BM_ITER(ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { ((BMHeader **)output->data.p)[i] = ele; i++; } } if (htype & BM_EDGE) { - BM_ITER(ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { ((BMHeader **)output->data.p)[i] = ele; i++; } } if (htype & BM_FACE) { - BM_ITER(ele, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_FACES_OF_MESH, NULL) { ((BMHeader **)output->data.p)[i] = ele; i++; } @@ -714,7 +714,7 @@ static void bmo_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *sl /* TODO - collapse these loops into one */ if (htype & BM_VERT) { - BM_ITER(ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { if (!BM_elem_flag_test(ele, BM_ELEM_HIDDEN) && BM_elem_flag_test_bool(ele, hflag) == test_for_enabled) { @@ -725,7 +725,7 @@ static void bmo_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *sl } if (htype & BM_EDGE) { - BM_ITER(ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { if (!BM_elem_flag_test(ele, BM_ELEM_HIDDEN) && BM_elem_flag_test_bool(ele, hflag) == test_for_enabled) { @@ -736,7 +736,7 @@ static void bmo_slot_buffer_from_hflag(BMesh *bm, BMOperator *op, const char *sl } if (htype & BM_FACE) { - BM_ITER(ele, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_FACES_OF_MESH, NULL) { if (!BM_elem_flag_test(ele, BM_ELEM_HIDDEN) && BM_elem_flag_test_bool(ele, hflag) == test_for_enabled) { @@ -828,7 +828,7 @@ static void bmo_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char *slo /* TODO - collapse these loops into one */ if (htype & BM_VERT) { - BM_ITER(ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_VERTS_OF_MESH, NULL) { if (BMO_elem_flag_test_bool(bm, (BMElemF *)ele, oflag) == test_for_enabled) { ele_array[i] = ele; i++; @@ -837,7 +837,7 @@ static void bmo_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char *slo } if (htype & BM_EDGE) { - BM_ITER(ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_EDGES_OF_MESH, NULL) { if (BMO_elem_flag_test_bool(bm, (BMElemF *)ele, oflag) == test_for_enabled) { ele_array[i] = ele; i++; @@ -846,7 +846,7 @@ static void bmo_slot_buffer_from_flag(BMesh *bm, BMOperator *op, const char *slo } if (htype & BM_FACE) { - BM_ITER(ele, &iter, bm, BM_FACES_OF_MESH, NULL) { + BM_ITER (ele, &iter, bm, BM_FACES_OF_MESH, NULL) { if (BMO_elem_flag_test_bool(bm, (BMElemF *)ele, oflag) == test_for_enabled) { ele_array[i] = ele; i++; @@ -1035,19 +1035,19 @@ static void bmo_flag_layer_alloc(BMesh *bm) bm->toolflagpool = newpool = BLI_mempool_create(sizeof(BMFlagLayer) * bm->totflags, 512, 512, 0); /* now go through and memcpy all the flags. Loops don't get a flag layer at this time.. */ - BM_ITER_INDEX(ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, old_totflags_size); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, old_totflags_size); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, old_totflags_size); @@ -1080,19 +1080,19 @@ static void bmo_flag_layer_free(BMesh *bm) bm->toolflagpool = newpool = BLI_mempool_create(new_totflags_size, 512, 512, BLI_MEMPOOL_SYSMALLOC); /* now go through and memcpy all the flag */ - BM_ITER_INDEX(ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, new_totflags_size); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, new_totflags_size); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { oldflags = ele->oflags; ele->oflags = BLI_mempool_calloc(newpool); memcpy(ele->oflags, oldflags, new_totflags_size); @@ -1115,15 +1115,15 @@ static void bmo_flag_layer_clear(BMesh *bm) const int totflags_offset = bm->totflags - 1; /* now go through and memcpy all the flag */ - BM_ITER_INDEX(ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_VERTS_OF_MESH, NULL, i) { memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer)); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer)); BM_elem_index_set(ele, i); /* set_inline */ } - BM_ITER_INDEX(ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { + BM_ITER_INDEX (ele, &iter, bm, BM_FACES_OF_MESH, NULL, i) { memset(ele->oflags + totflags_offset, 0, sizeof(BMFlagLayer)); BM_elem_index_set(ele, i); /* set_inline */ } |