diff options
| author | Jose Antonio Marquez | 2012-06-28 11:06:09 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-06-28 11:06:09 -0700 |
| commit | e46d1e54c2eac20488e7f3e2fa6c7d49ddfaaef1 (patch) | |
| tree | e809732934c2ed0b26efd68abe3b6c9a1fefd371 /js/panels | |
| parent | a892b069e866f7d87bd0d8439deec38e2cd604fd (diff) | |
| parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
| download | ninja-e46d1e54c2eac20488e7f3e2fa6c7d49ddfaaef1.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index ef13f22e..45353a08 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 1220 | for(i=0;i<arrSelectedIndexesLength;i++){ | 1220 | for(i=0;i<arrSelectedIndexesLength;i++){ |
| 1221 | for(j=0;j<currentLayersSelectedLength;j++){ | 1221 | for(j=0;j<currentLayersSelectedLength;j++){ |
| 1222 | 1222 | ||
| 1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ | 1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ |
| 1224 | matchedValues+=1; | 1224 | matchedValues+=1; |
| 1225 | } | 1225 | } |
| 1226 | } | 1226 | } |