From 0b41d5c873b25461e2217782af1c410b89cb56de Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 15 Jun 2012 14:03:03 -0700
Subject: Timeline: Bug fix IKNINJA 1716, "Ease options are not correctly
 displayed in Timeline after a file is saved and re-opened."

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/panels/Timeline/TimelineTrack.reel')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fc88b779..695f13ac 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -879,6 +879,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                             newTween.tweenData.keyFrameMillisec = currentMilliSec;
                             newTween.tweenData.tweenID = this.nextKeyframe;
                             newTween.tweenData.spanPosition =clickPosition - newTween.tweenData.spanWidth;
+                            newTween.tweenData.easing = this.currentKeyframeRule[i].style.webkitAnimationName;
                             this.tweens.push(newTween);
                         }
                         this.nextKeyframe += 1;
-- 
cgit v1.2.3