diff options
author | Jonathan Duran | 2012-02-29 07:40:54 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-29 07:40:54 -0800 |
commit | 63740007b2fb4d8e71180bc3c7c8441929857b40 (patch) | |
tree | f36dbb79ff389b48f42c961a95777c210f30d3ec /js/panels/Timeline/TimelineTrack.reel | |
parent | 72c3277e5b03343afc043c033fecda95b6c229bc (diff) | |
parent | 631c9750e5ad6d7739d8683c31aa3a9f8f3b4e4c (diff) | |
download | ninja-63740007b2fb4d8e71180bc3c7c8441929857b40.tar.gz |
Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Timeline
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{ |