diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-16 18:33:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-16 18:33:32 +0400 |
| commit | 7ec47aa8642e67b46cd3d0f19360433222d9ee47 (patch) | |
| tree | 2f31e9e70f4140905a2f9edf038bf8d02a56cb78 /source/blender/bmesh/operators | |
| parent | a7b83837db63c799c05b257c67db9d980a1650eb (diff) | |
code cleanup: shadowing
Diffstat (limited to 'source/blender/bmesh/operators')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c | 14 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 11 |
2 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 498ef530a85..dc00d020083 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -160,19 +160,19 @@ static int clamp_index(const int x, const int len) * isn't there should be... */ #define ARRAY_SWAP(elemtype, arr1, arr2) \ { \ - int i; \ + int i_; \ elemtype *arr_tmp = NULL; \ BLI_array_declare(arr_tmp); \ - for (i = 0; i < BLI_array_count(arr1); i++) { \ - BLI_array_append(arr_tmp, arr1[i]); \ + for (i_ = 0; i_ < BLI_array_count(arr1); i_++) { \ + BLI_array_append(arr_tmp, arr1[i_]); \ } \ BLI_array_empty(arr1); \ - for (i = 0; i < BLI_array_count(arr2); i++) { \ - BLI_array_append(arr1, arr2[i]); \ + for (i_ = 0; i_ < BLI_array_count(arr2); i_++) { \ + BLI_array_append(arr1, arr2[i_]); \ } \ BLI_array_empty(arr2); \ - for (i = 0; i < BLI_array_count(arr_tmp); i++) { \ - BLI_array_append(arr2, arr_tmp[i]); \ + for (i_ = 0; i_ < BLI_array_count(arr_tmp); i_++) { \ + BLI_array_append(arr2, arr_tmp[i_]); \ } \ BLI_array_free(arr_tmp); \ } (void)0 diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 50220cfaa0c..9fab89f8e0a 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -810,9 +810,9 @@ static EPath *edge_find_shortest_path(BMesh *bm, BMOperator *op, BMEdge *edge, E } if (use_restrict) { - int *group = (int *)BMO_slot_map_data_get(slot_restrict, e); - if (group) { - if (!(*group & path->group)) { + int *group_flag = (int *)BMO_slot_map_data_get(slot_restrict, e); + if (group_flag) { + if (!(*group_flag & path->group)) { v2 = NULL; continue; } @@ -925,15 +925,12 @@ void bmo_edgenet_fill_exec(BMesh *bm, BMOperator *op) BMO_elem_flag_enable(bm, f, ELE_ORIG); } - i = 0; - BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { + BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) { BM_elem_index_set(e, i); /* set_inline */ if (!BMO_elem_flag_test(bm, e, EDGE_MARK)) { edata[i].tag = 2; } - - i++; } bm->elem_index_dirty &= ~BM_EDGE; |