Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

1 files changed, 8 insertions, 10 deletions

diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 8edf1fee..72a55322 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -9,6 +9,7 @@ var Montage = require("montage/core/core").Montage,
     drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
     vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
     snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
 exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
@@ -65,10 +66,8 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                 }
             }
 
-            if(this._targets)
-            {
-                var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
-                                                                new WebKitPoint(event.pageX, event.pageY));
+            if(this.application.ninja.selectedElements.length) {
+                var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(event.pageX, event.pageY));
 
                                 // do the snap before setting up the avoid list to allow
                                 // a snap on the mouse down
@@ -96,11 +95,10 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
                 }
 
                 // we don't want to snap to selected objects during the drag
-                var len = this._targets.length;
-                for(var i=0; i<len; i++)
-                {
-                    snapManager.addToAvoidList( this._targets[i].elt );
-                }
+                this.application.ninja.selectedElements.forEach(function(element) {
+                    snapManager.addToAvoidList(element);
+                });
+
                                 if (hitRec)
                                 {
                                         // disable snap attributes
@@ -122,7 +120,7 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
 
                     if(!this._dragPlane)
                     {
-                        if( this._inLocalMode && (this._targets.length === 1) )
+                        if( this._inLocalMode && (this.application.ninja.selectedElements.length === 1) )
                         {
                             this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject);
                             snapManager.setupDragPlaneFromPlane(this._dragPlane);