2 files changed, 10 insertions, 4 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index c0c4ccfc..3ed7ed0f 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1920,6 +1920,12 @@ NinjaCvsRt.RuntimeSubPath = Object.create(NinjaCvsRt.RuntimeGeomObj, {
     _strokeColor: {value: null, writable: true},
     _fillColor: {value: null, writable: true},
 
+    geomType: {
+        value: function () {
+            return this.GEOM_TYPE_CUBIC_BEZIER;
+        }
+    },
+
     importJSON: {
         value: function(jo) {
             if (this.geomType()!== jo.geomType){
@@ -1929,7 +1935,7 @@ NinjaCvsRt.RuntimeSubPath = Object.create(NinjaCvsRt.RuntimeGeomObj, {
             this._Anchors = [];
             var i=0;
             for (i=0;i<jo.anchors.length;i++){
-                var newAnchor = new NinjaCvsRt.AnchorPoint();
+                var newAnchor = Object.create(NinjaCvsRt.AnchorPoint);
                 var ipAnchor = jo.anchors[i];
                 newAnchor.setPos(ipAnchor._x, ipAnchor._y, ipAnchor._z);
                 newAnchor.setPrevPos(ipAnchor._prevX, ipAnchor._prevY, ipAnchor._prevZ);
@@ -1993,8 +1999,8 @@ NinjaCvsRt.RuntimeSubPath = Object.create(NinjaCvsRt.RuntimeGeomObj, {
                     var currAnchor = this._Anchors[0];
                     ctx.bezierCurveTo(prevAnchor.getNextX(),prevAnchor.getNextY(), currAnchor.getPrevX(), currAnchor.getPrevY(), currAnchor.getPosX(), currAnchor.getPosY());
                     prevAnchor = currAnchor;
-                    ctx.fill();
                 }
+                ctx.fill();
                 ctx.stroke();
             }
             ctx.restore();
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 0532bdb3..bb163202 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -337,7 +337,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             var hitRec = this.getHitRecord(event.pageX, event.pageY, false);
             var globalMousePos=null, localMousePos=null, stageWorldMousePos = null, drawingCanvas=null;
             if (!this._selectedSubpathCanvas){
-                drawingCanvas = ViewUtils.getStageElement();
+                drawingCanvas = this.application.ninja.currentDocument.model.documentRoot;//ViewUtils.getStageElement();
                 stageWorldMousePos = hitRec.calculateStageWorldPoint();
                 stageWorldMousePos[0]+= snapManager.getStageWidth()*0.5;
                 stageWorldMousePos[1]+= snapManager.getStageHeight()*0.5;
@@ -550,7 +550,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; //ViewUtils.getStageElement();
                 stageWorldMousePos = hitRec.calculateStageWorldPoint();
                 stageWorldMousePos[0]+= snapManager.getStageWidth()*0.5;
                 stageWorldMousePos[1]+= snapManager.getStageHeight()*0.5;