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/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 24fd8392..33029e9e 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -268,7 +268,9 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
     insertPropTween:{
         value:function(clickPos){
             var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
-            this.application.ninja.timeline.selectLayer(selectedIndex, true);
+            // this.application.ninja.timeline.selectLayer(selectedIndex, true); // Deprecated.
+            this.application.ninja.timeline.selectLayers([selectedIndex]);
+            this.application.ninja.timeline.updateStageSelection();
 
             var currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
             var currentMillisec = currentMillisecPerPixel * clickPos;