diff options
| author | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
| commit | 9809c96d96c24a512f6da1efbf44f174ca9321fe (patch) | |
| tree | fa87aeee120500e57d1077c6c0c01a6cc717e144 /js/panels/Timeline/TimelinePanel.reel | |
| parent | 458714f5bf2ab095f6e96dfec3f9ff7042527c04 (diff) | |
| parent | a8dff9f5cb9dec84e6805118d49903710b361275 (diff) | |
| download | ninja-9809c96d96c24a512f6da1efbf44f174ca9321fe.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 185211ae..8be0caef 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -1721,6 +1721,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 1721 | this.trackRepetition.childComponents[trackIndex].tweenRepetition.childComponents[tweenIndex+1].setData(); | 1721 | this.trackRepetition.childComponents[trackIndex].tweenRepetition.childComponents[tweenIndex+1].setData(); |
| 1722 | } | 1722 | } |
| 1723 | this.trackRepetition.childComponents[trackIndex].tweenRepetition.childComponents[tweenIndex].selectTween(); | 1723 | this.trackRepetition.childComponents[trackIndex].tweenRepetition.childComponents[tweenIndex].selectTween(); |
| 1724 | this.trackRepetition.childComponents[trackIndex].tweenRepetition.childComponents[tweenIndex].keyframe.selectKeyframe(); | ||
| 1724 | this.trackRepetition.childComponents[trackIndex].updateKeyframeRule(); | 1725 | this.trackRepetition.childComponents[trackIndex].updateKeyframeRule(); |
| 1725 | 1726 | ||
| 1726 | // If this is the last keyframe, we'll need to update the track duration | 1727 | // If this is the last keyframe, we'll need to update the track duration |