Merge branch 'refs/heads/master' into tag-2.0

2 files changed, 42 insertions, 4 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 81a740e0..88830964 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -651,6 +651,21 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._lineColor = saveColor;
                         this._drawingContext.lineWidth = saveLineWidth;
 
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                // draw an outline around the body
+                var stagePt = MathUtils.getPointOnPlane([0,0,1,0]);
+                var stageMat = this.getPlaneToWorldMatrix([0,0,1], stagePt);
+    //            glmat4.multiply( tMat, stageMat, stageMat);
+                pt0 = [0, 0, 0];
+                pt1 = [0, height, 0];
+                delta = [width, 0, 0];
+                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
+                pt0 = [0, 0, 0];
+                pt1 = [width, 0, 0];
+                delta = [0, height, 0];
+                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
+            }
+
                         // draw the lines
                         this.redrawGridLines();
 
@@ -752,12 +767,27 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._drawingContext.lineWidth = 0.25;
 
                         // draw the lines
-                        var nLines = this._gridLineArray.length;
+            var line,
+                            nLines = this._gridLineArray.length;
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                            nLines = this._gridLineArray.length-4;
+            }
+
                         for (var i = 0; i < nLines; i++) {
-                                var line = this._gridLineArray[i];
+                                line = this._gridLineArray[i];
                                 this.drawIntersectedLine(line, this._drawingContext);
                         }
 
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                this._lineColor = "red";
+                i = nLines;
+                nLines += 4;
+                for (; i < nLines; i++) {
+                    line = this._gridLineArray[i];
+                    this.drawIntersectedLine(line, this._drawingContext);
+                }
+            }
+
                         this.popState();
                 }
         },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 7fc492a5..f4bfc12b 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1617,7 +1617,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         if (x > y) {
                                                 if (x > z) {
                                                         plane[0] = 1;
-                                                        plane[3] = this.getStageWidth() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollWidth / 2.0;
+                            } else {
+                                plane[3] = this.getStageWidth() / 2.0;
+                            }
                                                         if (dir[0] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawYZ;
                                                         drawUtils.drawXY = drawUtils.drawXZ = false;
@@ -1635,7 +1639,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         else {
                                                 if (y > z) {
                                                         plane[1] = 1;
-                                                        plane[3] = this.getStageHeight() / 2.0;
+                            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                                plane[3] = stage.scrollHeight / 2.0;
+                            } else {
+                                plane[3] = this.getStageHeight() / 2.0;
+                            }
                                                         if (dir[1] > 0) plane[3] = -plane[3];
                                                         change = !drawUtils.drawXZ;
                                                         drawUtils.drawXY = drawUtils.drawYZ = false;