diff options
author | Jon Reid | 2012-03-06 14:14:01 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:14:01 -0800 |
commit | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch) | |
tree | 0087ad093418638ff1d0b4362715bd7b2d147eba /js/panels/Timeline/Tween.reel | |
parent | d64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff) | |
parent | 342fb451bd251358068a0dcb10e9dc218b79a176 (diff) | |
download | ninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 3a195f47..6ff38bef 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -175,7 +175,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
175 | 175 | ||
176 | // select the containing layer | 176 | // select the containing layer |
177 | var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); | 177 | var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); |
178 | this.application.ninja.timeline.selectLayer(selectIndex); | 178 | this.application.ninja.timeline.selectLayer(selectIndex, true); |
179 | 179 | ||
180 | // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline | 180 | // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline |
181 | this.application.ninja.timeline.deselectTweens(); | 181 | this.application.ninja.timeline.deselectTweens(); |