diff options
author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
tree | 632484428b398f71b8481aa8e30180895ff2483c /js/ninja.reel | |
parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz |
Merge branch 'pentool' into brushtool
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 | }, |