diff options
| author | Jon Reid | 2012-06-25 11:07:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-25 11:07:33 -0700 |
| commit | 831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch) | |
| tree | aa6acda9aeddad8f93cae63b955349a442ddf01f /js/stage/layout.js | |
| parent | 82638621ed793fcb37438798363dba151efd9cd2 (diff) | |
| parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
| download | ninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Resolution: Use both.
Diffstat (limited to 'js/stage/layout.js')
| -rwxr-xr-x | js/stage/layout.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 28484b71..99c3a403 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
| @@ -46,6 +46,9 @@ exports.Layout = Montage.create(Component, { | |||
| 46 | return; | 46 | return; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | drawUtils._eltArray.length = 0; | ||
| 50 | drawUtils._planesArray.length = 0; | ||
| 51 | |||
| 49 | this._currentDocument = value; | 52 | this._currentDocument = value; |
| 50 | 53 | ||
| 51 | if(!value) { | 54 | if(!value) { |