31 files changed, 3659 insertions, 435 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 0a950658..ada6960b 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1087,6 +1087,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
                         // we need to check the orientation of the bounds
                         var nrm = MathUtils.getNormalFromBounds3D( bounds3D );
+                        if (MathUtils.fpSign(nrm[2]) == 0)  return null;
                         var zNrm = nrm[2];
                         var dist;
 
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a2fac34f..bedda8bf 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -1226,6 +1226,14 @@ exports.ViewUtils = Montage.create(Component, {
             }
     },
 
+        getCurrentDocument:
+        {
+                value: function()
+                {
+                        return snapManagerModule.SnapManager.application.ninja.currentDocument;
+                }
+        },
+
         setStageZoom: {
         value:function( globalPt,  zoomFactor ) {
             var localPt;
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 08057778..5b32547e 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -400,7 +400,10 @@ function GLCircle()
                         ctx.lineWidth = 0;
                         ctx.fillStyle   = "#990000";
                         if (this._fillColor)
-                                ctx.fillStyle = MathUtils.colorToHex( this._fillColor );
+                        {
+                                var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
+                                ctx.fillStyle = c;
+                        }
 
                         // draw the fill
                         ctx.beginPath();
@@ -460,7 +463,10 @@ function GLCircle()
                         ctx.lineWidth   = lineWidth;
                         ctx.strokeStyle = "#0000ff";
                         if (this._strokeColor)
-                                ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor );
+                        {
+                                var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
+                                ctx.strokeStyle = c;
+                        }
                         
                         // draw the stroke
                         p = MathUtils.transformPoint( bezPts[0],   mat );
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 5ec51230..0d815145 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -11,74 +11,74 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ///////////////////////////////////////////////////////////////////////
 function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj)
 {
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    this._width = 2.0;
-    this._height = 2.0;
-    this._xOffset = 0;
-    this._yOffset = 0;
-
-    // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
-    this._xAdj = 0;
-    this._yAdj = 0;
-    
-    this._slope = 0;
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        this._width = 2.0;
+        this._height = 2.0;
+        this._xOffset = 0;
+        this._yOffset = 0;
+
+        // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
+        this._xAdj = 0;
+        this._yAdj = 0;
+        
+        this._slope = 0;
 
-    this._strokeWidth = 0.25;
+        this._strokeWidth = 0.25;
 
-    this._strokeStyle = "Solid";
-    this._scaleX = 1.0;
-    this._scaleY = 1.0;
+        this._strokeStyle = "Solid";
+        this._scaleX = 1.0;
+        this._scaleY = 1.0;
 
-    if (arguments.length > 0)
-    {
-        this._width = width;
-        this._height = height;
-        this._xOffset = xOffset;
-        this._yOffset = yOffset;
+        if (arguments.length > 0)
+        {
+                this._width = width;
+                this._height = height;
+                this._xOffset = xOffset;
+                this._yOffset = yOffset;
 
-        this._xAdj = xAdj;
-        this._yAdj = yAdj;
+                this._xAdj = xAdj;
+                this._yAdj = yAdj;
 
-        this._slope = slope;
-        this._strokeWidth = strokeSize;
-        this._strokeColor = strokeColor;
+                this._slope = slope;
+                this._strokeWidth = strokeSize;
+                this._strokeColor = strokeColor;
 
-        this._strokeStyle = strokeStyle;
-        this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
-    }
+                this._strokeStyle = strokeStyle;
+                this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
+        }
 
-    this._strokeVerticesLen = 0;
+        this._strokeVerticesLen = 0;
 
-    this.m_world = world;
+        this.m_world = world;
 
         this._materialAmbient  = [0.2, 0.2, 0.2,  1.0];
         this._materialDiffuse  = [0.4, 0.4, 0.4,  1.0];
         this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
-    // initialize the inherited members
-    this.inheritedFrom = GLGeomObj;
-    this.inheritedFrom();
+        // initialize the inherited members
+        this.inheritedFrom = GLGeomObj;
+        this.inheritedFrom();
 
-    if(strokeMaterial)
-    {
-        this._strokeMaterial = strokeMaterial;
-    }
+        if(strokeMaterial)
+        {
+                this._strokeMaterial = strokeMaterial;
+        }
 
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
         this.getStrokeWidth             = function()            {  return this._strokeWidth;    }
         this.setStrokeWidth             = function(w)           {  this._strokeWidth = w;               }
 
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial; }
         this.setStrokeMaterial  = function(m)           {  this._strokeMaterial = m;    }