Merge pull request #950 from jtwigg/v3.2

V3.2 Fix Tweening Unit Test.

Author: vlidholt

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -171,10 +171,6 @@ - (CCBSequence*)sequenceFromSequenceId:(int)seqId {
 - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyframe*)kf1 propertyName:(NSString*)name node:(CCNode*)node {
     float duration = kf1.time - kf0.time;
 
-    if(kf0.easingType==kCCBKeyframeEasingInstant) {
-        duration = 0;
-    }
-    
     if ([name isEqualToString:@"rotation"]) {
         return [CCActionRotateTo actionWithDuration:duration angle:[kf1.value floatValue] simple:YES];
     } else if ([name isEqualToString:@"position"]) {
@@ -360,7 +356,7 @@ - (void)runActionsForNode:(CCNode*)node sequenceProperty:(CCBSequenceProperty*)s
     if(numKeyframes<1) return;
 
     // Action Sequence Builder
-    NSMutableArray* actions = [NSMutableArray array];
+        NSMutableArray* actions = [NSMutableArray array];
     int endFrame            = startFrame+1;
 
     if(endFrame==numKeyframes || endFrame<0)
@@ -469,6 +465,11 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
     _paused = YES;
     [self clearAllActions];
 
+	// Set the running scene
+    _runningSequence      = [self sequenceFromSequenceId:seqId];
+    _runningSequence.time = 0.0f;
+	_runningSequence.tween = tweenDuration;
+	
 	[self addSequenceCallBacks:seqId tweenDuration:tweenDuration startTime:0];
 
     // Contains all Sequence Propertys / Keyframe
@@ -510,26 +511,13 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
                     }
                 }
             }
-            
-            // Reset nodes that have sequence node properties, build first keyframe action sequence.
-            for (NSString* propName in seqNodeProps) {
-                CCBSequenceProperty* seqProp = [seqNodeProps objectForKey:propName];
-                [seqNodePropNames addObject:propName];
-                
-                // Reset Node State to First KeyFrame
-                [self setKeyFrameForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration keyFrame:0];
-                
-            }
+           
         }
 
 
     }
 
-    // Set the running scene
-    _runningSequence      = [self sequenceFromSequenceId:seqId];
-    _runningSequence.time = 0.0f;
-    
-    _paused = NO;
+	    _paused = NO;
 }
 
 - (void)runAnimationsForSequenceNamed:(NSString*)name tweenDuration:(float)tweenDuration {
@@ -864,8 +852,8 @@ - (CCActionSequence*)createActionForNode:(CCNode*)node sequenceProperty:(CCBSequ
             // Instant
             if(startKF.easingType==kCCBKeyframeEasingInstant) {
                 [actions addObject:[CCActionDelay actionWithDuration:endKF.time-startKF.time]];
-            }
-            
+        }
+        
             // Apply Easing
             action = [self easeAction:action easingType:startKF.easingType easingOpt:startKF.easingOpt];
             [actions addObject:action];