3 files changed, 36 insertions, 5 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index c07391db..85870097 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -115,6 +115,26 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 }
         },
 
+    initializeFromDocument:{
+        value:function(){
+            var documentRootChildren = null, i;
+            //initialize with current document
+            this._eltArray = [];
+            this._planesArray = [];
+            this.setDrawingSurfaceElement(this.application.ninja.stage.canvas);
+            this.setSourceSpaceElement( this.application.ninja.stage.stageDeps.currentStage );
+            this.setWorkingPlane( Vector.create( [0,0,1,0] ) );
+
+            //Loop through all the top-level children of the current document and call drawUtils.addElement on them
+            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
+                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
+                for(i=0;i<documentRootChildren.length;i++){
+                    this.addElement(documentRootChildren[i]);
+                }
+            }
+        }
+    },
+
     handleElementAdded: {
         value: function(event) {
             this.addElement(event.detail);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index ada6960b..372be345 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -521,7 +521,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
                                                 if (!elt.elementModel)
                                                 {
-                            NJUtils.makeElementModel2(elt);
+                            NJUtils.makeModelFromElement(elt);
                                                 }
                                                 elt.elementModel.isIn2DSnapCache = true;
                                         }
@@ -588,7 +588,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
                                         if (!elt.elementModel)
                                         {
-                                                NJUtils.makeElementModel2(elt);
+                                                NJUtils.makeModelFromElement(elt);
                                         }
                                         elt.elementModel.isIn2DSnapCache = true;
                                 }
@@ -597,7 +597,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;
             }
@@ -1007,7 +1008,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;
             }
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a2fac34f..c1f59397 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -580,7 +580,8 @@ exports.ViewUtils = Montage.create(Component, {
                 if (elt.style.height)   h  = MathUtils.styleToNumber(elt.style.height);
             }
 
-            if (elt instanceof SVGSVGElement) {
+//            if (elt instanceof SVGSVGElement) {
+            if(elt.nodeName.toLowerCase() === "svg") {
                         if(w instanceof SVGAnimatedLength)
                             w = w.animVal.value;
                         if(h instanceof SVGAnimatedLength)
@@ -1226,6 +1227,14 @@ exports.ViewUtils = Montage.create(Component, {
             }
     },
 
+        getCurrentDocument:
+        {
+                value: function()
+                {
+                        return snapManagerModule.SnapManager.application.ninja.currentDocument;
+                }
+        },
+
         setStageZoom: {
         value:function( globalPt,  zoomFactor ) {
             var localPt;