[Bf-blender-cvs] [daa90de] master: Cleanup: shadowing (bmesh)
Campbell Barton
noreply at git.blender.org
Mon Nov 23 07:51:53 CET 2015
Commit: daa90de3fdb5b9971b713c13a67b9c0a0990b3d7
Author: Campbell Barton
Date: Mon Nov 23 12:34:50 2015 +1100
Branches: master
https://developer.blender.org/rBdaa90de3fdb5b9971b713c13a67b9c0a0990b3d7
Cleanup: shadowing (bmesh)
===================================================================
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/operators/bmo_inset.c
M source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 24d70ce..931413d 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 48bdc32..5f22481 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 23a5825..627f835 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) {
diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c
index 7bdf7db..1438efa 100644
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@ -571,7 +571,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
BMVert *v;
BMEdge *e;
BMFace *f;
- int i, j, k;
+ int i, k;
if (use_interpolate) {
interp_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
@@ -722,7 +722,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
* here but don't do this since we will be splitting them off (iterating stuff you modify is bad juju)
* instead loop over edges then their verts */
for (i = 0, es = edge_info; i < edge_info_len; i++, es++) {
- for (j = 0; j < 2; j++) {
+ for (int j = 0; j < 2; j++) {
v = (j == 0) ? es->e_new->v1 : es->e_new->v2;
/* end confusing part - just pretend this is a typical loop on verts */
@@ -1004,6 +1004,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
/* create faces */
for (i = 0, es = edge_info; i < edge_info_len; i++, es++) {
BMVert *varr[4] = {NULL};
+ int j;
/* get the verts in the correct order */
BM_edge_ordered_verts_ex(es->e_new, &varr[1], &varr[0], es->l);
#if 0
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index 94658f1..6fb09c7 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -123,7 +123,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
for (sf_vert = sf_ctx.fillvertbase.first, i = 0; sf_vert; sf_vert = sf_vert->next, i++) {
BMVert *v = sf_vert->tmp.p;
BMIter eiter;
- BMEdge *e, *e_pair[2];
+ BMEdge *e_pair[2];
unsigned int e_index = 0;
nors[i].value = -1.0f;
More information about the Bf-blender-cvs
mailing list