diff options
| author | Valerio Virgillito | 2012-02-29 12:10:03 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-29 12:10:03 -0800 |
| commit | 052d9805a6f0a3a90d6849eb94eabffb7ec26962 (patch) | |
| tree | f420f7ca8313343ee27244aef1ff600bfb0eab58 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
| parent | 3d233f25cff057fff5c5a75e4c4b40e88c22a8f5 (diff) | |
| parent | 2f3e4d12aa15077d3cc9794862156e57b7815e68 (diff) | |
| download | ninja-052d9805a6f0a3a90d6849eb94eabffb7ec26962.tar.gz | |
Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-internal into integration-candidate
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
| -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{ |