1 files changed, 9 insertions, 18 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 069c6022..a8b6e739 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,8 +21,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    drawingCanvas: { value: null, writable: true},
-    
+
+    currentStage: { value: null },
+
         // we keep a stack of working planes to facilitate working on other planes temporarily
         _workingPlaneStack : { value: [], writable: true },
 
@@ -83,14 +84,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetWidth);
+                return parseInt(this.currentStage.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.application.ninja.currentDocument.model.documentRoot.offsetHeight);
+                return parseInt(this.currentStage.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.application.ninja.currentDocument.model.documentRoot;    }},
+    getStage : { value: function()              {        return this.currentStage;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -480,10 +481,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 {
                                         var snapRec = this._elementCache[i];
                                         var elt = snapRec.getElement();
-                                        if (elt.elementModel)
-                        elt.elementModel.isIn2DSnapCache = false;
-                                        else
-                                                console.log( "element in the 2D cache does not have an elementModel" );
+                    elt.elementModel.isIn2DSnapCache = false;
+
                                 }
 
                                 this._elementCache = null;
@@ -540,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                 snapRec.init( elt );
                                                 this._elementCache.push( snapRec );
 
-                                                if (!elt.elementModel)
-                                                {
-                            NJUtils.makeModelFromElement(elt);
-                                                }
                                                 elt.elementModel.isIn2DSnapCache = true;
                                         }
                                         else if (elt.elementModel)
@@ -612,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         snapRec.init( elt );
                                         this._elementCache.push( snapRec );
 
-                                        if (!elt.elementModel)
-                                        {
-                                                NJUtils.makeModelFromElement(elt);
-                                        }
                                         elt.elementModel.isIn2DSnapCache = true;
                                 }
                                 else if (elt.elementModel)
@@ -2124,7 +2115,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         if (hitRec)
                         {
                                 var saveContext = drawUtils.getDrawingSurfaceElement();
-                                drawUtils.setDrawingSurfaceElement(this.drawingCanvas);
+                                drawUtils.setDrawingSurfaceElement(this.application.ninja.stage.drawingCanvas);
                                 var context = drawUtils.getDrawingContext();
                                 if (context)
                                 {