diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 03db7880..1ce627b7 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -668,7 +668,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 668 | 668 | ||
| 669 | //debugger; | 669 | //debugger; |
| 670 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { | 670 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { |
| 671 | this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; | 671 | // this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; |
| 672 | } | 672 | } |
| 673 | 673 | ||
| 674 | // Are we only showing animated layers? | 674 | // Are we only showing animated layers? |