Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index b4f55bd9..f8b32d23 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -54,10 +54,10 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
             else
             {
                 this._delta = null;
-                // special case for z-translation
-                if(this._handleMode === 2)
+                //if(this._handleMode === 2)
                 {
-                    this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target);
+                    this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target, this._handleMode, this._inLocalMode);
+                                        //console.log( "dragPlane: " + this._dragPlane );
                     snapManager.setupDragPlaneFromPlane(this._dragPlane);
                     do3DSnap = false;
 
@@ -86,7 +86,8 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                     var elt = this.application.ninja.stage.getElement(event, true);
                     if(elt && (elt !== hitRec.getElement()))
                     {
-                        hitRec = snapManager.findHitRecordForElement(elt);
+                        var otherSnap = snapManager.findHitRecordForElement(elt);
+                                                if (otherSnap)  hitRec = otherSnap;
                     }
                     if(elt === this.application.ninja.currentSelectedContainer)
                     {