diff options
| author | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 15:33:29 -0700 |
| commit | ad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch) | |
| tree | 35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/panels/Timeline/TimelinePanel.reel | |
| parent | 3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff) | |
| parent | 3ebed34665fa73b0ce613b400f3029ebf4476439 (diff) | |
| download | ninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
| -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 48818e44..d1cab096 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -654,7 +654,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 654 | 654 | ||
| 655 | //debugger; | 655 | //debugger; |
| 656 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { | 656 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { |
| 657 | this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; | 657 | // this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | // Are we only showing animated layers? | 660 | // Are we only showing animated layers? |