aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-06-26 13:38:57 -0700
committerJonathan Duran2012-06-26 13:38:57 -0700
commitdf6e43cea10a0c976390017ba41c33f74c4b7692 (patch)
tree8767dea246f406ebda892b4fd7d97eccaeebebc4
parent42ea74de49cc9f06d8231b99c2ee6c65b0f8a61a (diff)
downloadninja-df6e43cea10a0c976390017ba41c33f74c4b7692.tar.gz
Fix - deselect tweens when selecting a layer
Signed-off-by: Jonathan Duran <jduran@motorola.com>
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 470062ba..040ae7be 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1188,6 +1188,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1188 if (this.currentLayersSelected !== false) { 1188 if (this.currentLayersSelected !== false) {
1189 this.currentLayersSelected = false; 1189 this.currentLayersSelected = false;
1190 } 1190 }
1191
1192 // Deselect any tweens
1193 this.deselectTweens();
1191 1194
1192 // If we are actually going to be selecting things, create an empty array to use 1195 // If we are actually going to be selecting things, create an empty array to use
1193 if (arrSelectedIndexesLength > 0) { 1196 if (arrSelectedIndexesLength > 0) {