diff options
| author | Jon Reid | 2012-06-26 14:58:10 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-26 14:58:10 -0700 |
| commit | 2599f74d72293b809929d8a0b36fb8e721f194cd (patch) | |
| tree | ca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/panels/Timeline/TimelinePanel.reel | |
| parent | ab9d14780eed98f39786fae4518e69861b34bad7 (diff) | |
| parent | e4304b9ac6c58802de4dd334be1f5802533f5160 (diff) | |
| download | ninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 |
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 3f1af281..af358468 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -1240,6 +1240,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 1240 | if (this.currentLayersSelected !== false) { | 1240 | if (this.currentLayersSelected !== false) { |
| 1241 | this.currentLayersSelected = false; | 1241 | this.currentLayersSelected = false; |
| 1242 | } | 1242 | } |
| 1243 | |||
| 1244 | // Deselect any tweens | ||
| 1245 | this.deselectTweens(); | ||
| 1243 | 1246 | ||
| 1244 | // If we are actually going to be selecting things, create an empty array to use | 1247 | // If we are actually going to be selecting things, create an empty array to use |
| 1245 | if (arrSelectedIndexesLength > 0) { | 1248 | if (arrSelectedIndexesLength > 0) { |