diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 04:34:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:10 +0300 |
commit | daa90de3fdb5b9971b713c13a67b9c0a0990b3d7 (patch) | |
tree | 1731535b3342d674b02a1b1ebce17d4484a5877f /source/blender/bmesh/intern | |
parent | e2a79e8b6c638489c6c79dd6fa9136372fe37ec1 (diff) |
Cleanup: shadowing (bmesh)
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 24d70cefb2e..931413d834f 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -728,7 +728,6 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface) Object *ob; ModifierData *md; BMVert **vertMap = NULL; - int i, j; for (ob = G.main->object.first; ob; ob = ob->id.next) { if ((ob->parent) && (ob->parent->data == me) && ELEM(ob->partype, PARVERT1, PARVERT3)) { diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 48bdc324e69..5f224813d8d 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -1911,7 +1911,6 @@ error: fprintf(stderr, " "); { int pos = (int)(fmt - ofmt); - int i; for (i = 0; i < pos; i++) { fprintf(stderr, " "); } diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 23a58259f59..627f8358410 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -928,7 +928,6 @@ static void *bmw_EdgeLoopWalker_step(BMWalker *walker) BMEdge *e, *nexte = NULL; BMLoop *l; BMVert *v; - int i = 0; BMW_state_remove_r(walker, &owalk); lwalk = &owalk; @@ -968,7 +967,7 @@ static void *bmw_EdgeLoopWalker_step(BMWalker *walker) BMIter eiter; /* match trunk: mark all connected wire edges */ - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { v = i ? e->v2 : e->v1; BM_ITER_ELEM (nexte, &eiter, v, BM_EDGES_OF_VERT) { |