Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/linear-gradient-material.js

1 files changed, 5 insertions, 8 deletions

diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 919f7c50..00124900 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -156,14 +156,6 @@ exports.ViewUtils = Montage.create(Component, {
                                 viewDir = MathUtils.transformVector( [0,0,1],  stageInv );
                         }
 
-                        /*
-                        if (elt === stage)
-                        {
-                                xVec = [1,0,0];
-                                yVec = [0,1,0];
-                        }
-                        */
-
                         var plane;
                         var xDot, yDot, zDot;
                         switch (axis)
@@ -288,6 +280,11 @@ exports.ViewUtils = Montage.create(Component, {
         value: function( localPt,  elt ) {
             this.pushViewportObj( elt );
             var viewPt = this.screenToView( localPt[0], localPt[1], localPt[2] );
+                        if ((elt == null) || (elt === this._stageElement))
+                        {
+                                this.popViewportObj();
+                                return viewPt;
+                        }
             var mat = this.getMatrixFromElement( elt );
             var worldPt = MathUtils.transformPoint( viewPt, mat );
             var stageWorldPt = this.postViewToStageWorld( worldPt, elt );