diff options
| author | Jonathan Duran | 2012-03-12 16:58:33 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-12 16:58:33 -0700 |
| commit | e4c13b0febab589b881b2c997ce122c4d359c560 (patch) | |
| tree | ad5a69e84714a3f7fa579fb58951f3b06f4cf3f1 /js/ninja.reel | |
| parent | a28cb88194f45325e42dd8c774469424712dd6f4 (diff) | |
| parent | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff) | |
| download | ninja-e4c13b0febab589b881b2c997ce122c4d359c560.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 88361fd9..2a6e49f7 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
| @@ -143,7 +143,6 @@ exports.Ninja = Montage.create(Component, { | |||
| 143 | this.currentDocument = event.detail; | 143 | this.currentDocument = event.detail; |
| 144 | 144 | ||
| 145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; | 145 | this.appModel.show3dGrid = this.currentDocument.draw3DGrid; |
| 146 | |||
| 147 | NJevent("openDocument"); | 146 | NJevent("openDocument"); |
| 148 | } | 147 | } |
| 149 | }, | 148 | }, |