From f5ec4cf4e914542ef3ebb27b49dcf42699f610a9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 23 May 2011 08:14:29 +0000 Subject: fix own mistake [#27451] Flip to Top / Flip to Bottom menuitems on right click on header not working also get rig of more shadowed vars (-Wshadow). --- source/blender/editors/curve/editcurve.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/curve') diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 64dc640d6e1..99aebfffaee 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -780,7 +780,7 @@ static void calc_shapeKeys(Object *obedit) /* are there keys? */ if(cu->key) { - int a, i, j; + int a, i; EditNurb *editnurb= cu->editnurb; KeyBlock *currkey; KeyBlock *actkey= BLI_findlink(&cu->key->block, editnurb->shapenr-1); @@ -804,7 +804,6 @@ static void calc_shapeKeys(Object *obedit) } if(act_is_basis) { /* active key is a base */ - int j; int totvec= 0; /* Calculate needed memory to store offset */ @@ -831,6 +830,7 @@ static void calc_shapeKeys(Object *obedit) oldbezt= getKeyIndexOrig_bezt(editnurb, bezt); if (oldbezt) { + int j; for (j= 0; j < 3; ++j) { VECSUB(ofs[i], bezt->vec[j], oldbezt->vec[j]); i++; @@ -878,6 +878,7 @@ static void calc_shapeKeys(Object *obedit) bezt= nu->bezt; a= nu->pntsu; while(a--) { + int j; oldbezt= getKeyIndexOrig_bezt(editnurb, bezt); for (j= 0; j < 3; ++j, ++i) { @@ -932,6 +933,7 @@ static void calc_shapeKeys(Object *obedit) while(a--) { index= getKeyIndexOrig_keyIndex(editnurb, bezt); if (index >= 0) { + int j; curofp= ofp + index; for (j= 0; j < 3; ++j, ++i) { @@ -953,6 +955,7 @@ static void calc_shapeKeys(Object *obedit) fp+= 3; /* alphas */ } else { + int j; for (j= 0; j < 3; ++j, ++i) { VECCOPY(fp, bezt->vec[j]); fp+= 3; -- cgit v1.2.3