Bugfix #24719: Layer ipocurves from Blender 2.49 wrongly ported to Blender 2.5x

Found and fixed a few problems here, but strangely I don't recall seeing any of these a few months ago when this conversion (probably last) worked well ...

1 files changed, 26 insertions, 24 deletions

diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 7914bc2b640..5dc1cc2d746 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -111,27 +111,26 @@ typedef struct AdrBit2Path {
 
 /* Object layers */
 static AdrBit2Path ob_layer_bits[]= {
-	{(1<<0), "layer", 0},
-	{(1<<1), "layer", 1},
-	{(1<<2), "layer", 2},
-	{(1<<3), "layer", 3},
-	{(1<<4), "layer", 4},
-	{(1<<5), "layer", 5},
-	{(1<<6), "layer", 6},
-	{(1<<7), "layer", 7},
-	{(1<<8), "layer", 8},
-	{(1<<9), "layer", 9},
-	{(1<<10), "layer", 10},
-	{(1<<11), "layer", 11},
-	{(1<<12), "layer", 12},
-	{(1<<13), "layer", 13},
-	{(1<<14), "layer", 14},
-	{(1<<15), "layer", 15},
-	{(1<<16), "layer", 16},
-	{(1<<17), "layer", 17},
-	{(1<<18), "layer", 18},
-	{(1<<19), "layer", 19},
-	{(1<<20), "layer", 20}
+	{(1<<0), "layers", 0},
+	{(1<<1), "layers", 1},
+	{(1<<2), "layers", 2},
+	{(1<<3), "layers", 3},
+	{(1<<4), "layers", 4},
+	{(1<<5), "layers", 5},
+	{(1<<6), "layers", 6},
+	{(1<<7), "layers", 7},
+	{(1<<8), "layers", 8},
+	{(1<<9), "layers", 9},
+	{(1<<10), "layers", 10},
+	{(1<<11), "layers", 11},
+	{(1<<12), "layers", 12},
+	{(1<<13), "layers", 13},
+	{(1<<14), "layers", 14},
+	{(1<<15), "layers", 15},
+	{(1<<16), "layers", 16},
+	{(1<<17), "layers", 17},
+	{(1<<18), "layers", 18},
+	{(1<<19), "layers", 19}
 };
 
 /* Material mode */
@@ -1123,7 +1122,6 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 {
 	AdrBit2Path *abp;
 	FCurve *fcu;
-	unsigned int i=0;
 	int totbits;
 	
 	/* allocate memory for a new F-Curve */
@@ -1189,6 +1187,8 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 		 * 3) filter the keyframes for the flag of interest
 		 */
 		for (b=0; b < totbits; b++, abp++) {
+			unsigned int i=0;
+			
 			/* make a copy of existing base-data if not the last curve */
 			if (b < (totbits-1))
 				fcurve= copy_fcurve(fcu);
@@ -1212,7 +1212,7 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 				fcurve->bezt= MEM_callocN(sizeof(BezTriple)*fcurve->totvert, "BezTriples");
 				
 				/* loop through copying all BezTriples individually, as we need to modify a few things */
-				for (dst=fcurve->bezt, src=icu->bezt; i < fcurve->totvert; i++, dst++, src++) {
+				for (dst=fcurve->bezt, src=icu->bezt, i=0; i < fcurve->totvert; i++, dst++, src++) {
 					/* firstly, copy BezTriple data */
 					*dst= *src;
 					
@@ -1240,6 +1240,8 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 		}
 	}
 	else {
+		unsigned int i=0;
+		
 		/* get rna-path
 		 *	- we will need to set the 'disabled' flag if no path is able to be made (for now)
 		 */
@@ -1260,7 +1262,7 @@ static void icu_to_fcurves (ID *id, ListBase *groups, ListBase *list, IpoCurve *
 			fcu->bezt= MEM_callocN(sizeof(BezTriple)*fcu->totvert, "BezTriples");
 			
 			/* loop through copying all BezTriples individually, as we need to modify a few things */
-			for (dst=fcu->bezt, src=icu->bezt; i < fcu->totvert; i++, dst++, src++) {
+			for (dst=fcu->bezt, src=icu->bezt, i=0; i < fcu->totvert; i++, dst++, src++) {
 				/* firstly, copy BezTriple data */
 				*dst= *src;