Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into document-bindings-fix

3 files changed, 9 insertions, 2 deletions

diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index ac0dab5a..b9aa206b 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -56,7 +56,10 @@
                 }
             },
             "threeDProperties": {
-                "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]"
+                "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]",
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
+                }
             },
 
             "CustomSections": {
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 0320c327..49907c9d 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -198,6 +198,10 @@ exports.ThreeD = Montage.create(Component, {
         }
     },
 
+    _currentDocument: {
+        value : null
+    },
+
     currentDocument : {
         get : function() {
             return this._currentDocument;
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 10eb03c9..3813123a 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -428,7 +428,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             var globalMousePos=null, localMousePos=null, stageWorldMousePos = null;
             var drawingCanvas = this._selectedSubpath.getCanvas();
             if (!drawingCanvas){
-                drawingCanvas = ViewUtils.getStageElement();
+                drawingCanvas = this.application.ninja.currentDocument.model.documentRoot;
                 stageWorldMousePos = hitRec.calculateStageWorldPoint();
                 stageWorldMousePos[0]+= snapManager.getStageWidth()*0.5;
                 stageWorldMousePos[1]+= snapManager.getStageHeight()*0.5;