diff options
author | Jose Antonio Marquez | 2012-06-28 09:50:52 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 09:50:52 -0700 |
commit | a6fe9a1e84f983da1eecf4c97ae62bd27ce22476 (patch) | |
tree | 9d22ee868cd0f6997f5394eaaadce65e4a25e564 /js/panels/Timeline | |
parent | 5cd0ec9be1de5014c227118333be8ec596e908bd (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-a6fe9a1e84f983da1eecf4c97ae62bd27ce22476.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Timeline')
-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 50171260..ef13f22e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1773 | currentLayersSelectedLength = this.currentLayersSelected.length, | 1773 | currentLayersSelectedLength = this.currentLayersSelected.length, |
1774 | arrLayersLength = this.arrLayers.length, | 1774 | arrLayersLength = this.arrLayers.length, |
1775 | returnVal = arrLayersLength -1; | 1775 | returnVal = arrLayersLength -1; |
1776 | if (returnVal === -1) { | ||
1777 | return false; | ||
1778 | } | ||
1776 | if (this.currentLayersSelected === false) { | 1779 | if (this.currentLayersSelected === false) { |
1777 | return false; | 1780 | return false; |
1778 | } | 1781 | } |