Merge branch 'refs/heads/timeline-local' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 46b2042c..85fdfdc9 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -340,7 +340,9 @@ var Tween = exports.Tween = Montage.create(Component, {
         value: function(){
             this.eventManager.addEventListener("elementChange", this, false);
             var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID);
-            this.application.ninja.timeline.selectLayer(selectIndex, true);
+            // this.application.ninja.timeline.selectLayer(selectIndex, true); // deprecated
+            this.application.ninja.timeline.selectLayers([selectIndex]);
+            this.application.ninja.timeline.updateStageSelection();
             this.application.ninja.timeline.deselectTweens();
             this.application.ninja.timeline.selectedTweens.push(this);
             this.application.ninja.timeline.playhead.style.left = (this.keyFramePosition - 2) + "px";