aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-07 11:18:11 -0700
committerNivesh Rajbhandari2012-05-07 11:18:11 -0700
commite377a8dc0b0e34905782ed867acb5fe725ae0131 (patch)
tree6931311aabd7a4e366df195a168d437f1d0d8465 /js/panels/Timeline/TimelinePanel.reel
parent8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
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?