blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cleanup: shadowing (bmesh)

This commit is contained in:
Campbell Barton 2015-11-23 12:34:50 +11:00
parent e2a79e8b6c
commit daa90de3fd
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/bmesh/intern/bmesh_mesh_conv.c
View File

@ -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)) {

1
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -1911,7 +1911,6 @@ error:
fprintf(stderr, " ");
{
int pos = (int)(fmt - ofmt);
int i;
for (i = 0; i < pos; i++) {
fprintf(stderr, " ");
}

3
source/blender/bmesh/intern/bmesh_walkers_impl.c
View File

@ -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) {

5
source/blender/bmesh/operators/bmo_inset.c
View File

@ -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

2
source/blender/bmesh/operators/bmo_triangulate.c
View File

@ -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;