diff options
author | Kruti Shah | 2012-06-28 10:25:20 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-28 10:25:20 -0700 |
commit | ffb600b1919d2a101783fb6a10d1f1084bd1b032 (patch) | |
tree | 2e6a35422ef2a054b21626faa8236be0d7485243 /js/panels/Timeline | |
parent | 72bc34c58d52db0cc7eb1e5b647e9e4aa697a4c0 (diff) | |
parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
download | ninja-ffb600b1919d2a101783fb6a10d1f1084bd1b032.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline')
-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 | } |