diff options
| author | Jon Reid | 2012-02-29 10:00:32 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-02-29 10:00:32 -0800 |
| commit | 38a9395a9f5419bcf58ea02ab1ccf3f09615a6ea (patch) | |
| tree | b3cd26908093014ecaad8a02f55582b3f50fcf0b /js/panels/Timeline/TimelineTrack.reel | |
| parent | 38d8d4ea7d033b35f95e38ebb7d6abfd81bd2c69 (diff) | |
| parent | 63740007b2fb4d8e71180bc3c7c8441929857b40 (diff) | |
| download | ninja-38a9395a9f5419bcf58ea02ab1ccf3f09615a6ea.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 43cd7477..bf97c0fd 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
| @@ -519,6 +519,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
| 519 | i++; | 519 | i++; |
| 520 | this.nextKeyframe += 1; | 520 | this.nextKeyframe += 1; |
| 521 | } | 521 | } |
| 522 | this.isTrackAnimated = true; | ||
| 522 | } | 523 | } |
| 523 | } | 524 | } |
| 524 | else{ | 525 | else{ |