diff options
| author | Jon Reid | 2012-03-15 15:01:15 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-03-15 15:01:15 -0700 |
| commit | 75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch) | |
| tree | f3a157f8cd92a8defb47edc68d8881db46f20586 /js/panels/Timeline | |
| parent | 21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff) | |
| parent | 68d82cb56cb0235599c46caf349f328f15300fdf (diff) | |
| download | ninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
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 212b933e..45a90355 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -873,7 +873,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 873 | this.currentLayerSelected.layerData.elementsList.splice(length, 1); | 873 | this.currentLayerSelected.layerData.elementsList.splice(length, 1); |
| 874 | break; | 874 | break; |
| 875 | } | 875 | } |
| 876 | length--; | 876 | //length--; |
| 877 | } | 877 | } |
| 878 | } | 878 | } |
| 879 | }, | 879 | }, |