Merge pull request #110 from mqg734/WebGLFixes

Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool

1 files changed, 10 insertions, 2 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index cf8a91db..1caacd00 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1978,12 +1978,20 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         },
 
         setupDragPlanes : {
-                value: function( hitRec ) {
+                value: function( hitRec, inGlobalMode ) {
                         // get the location of the point in stage world space
                         var elt = hitRec.getElt();
                         var localPt = hitRec.getLocalPoint();
                         var planeMat = hitRec.getPlaneMatrix();
-                        var stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            var stageWorldPt;
+            if(inGlobalMode)
+            {
+                stageWorldPt = MathUtils.transformPoint(localPt,planeMat);
+            }
+            else
+            {
+                stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            }
 
                         /*
                          // get a working plane parallel to the current working plane through the stage world point