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

Conflicts:
	js/helper-classes/3D/view-utils.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js
	js/tools/Translate3DToolBase.js

1 files changed, 13 insertions, 8 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 2276178c..ac98d018 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -90,22 +90,21 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 value : function()
                 {
             var item,
-                elt,
                 mat,
                 dist,
                 newStyles = [],
                 previousStyles = [],
-                len = this._targets.length;
+                len = this.application.ninja.selectedElements.length;
             for(var i = 0; i < len; i++)
             {
                 // Reset to the identity matrix but retain the rotation values
-                item = this._targets[i];
-                mat = item.mat.slice(0);
+                item = this.application.ninja.selectedElements[i];
+                mat = ElementsMediator.getMatrix(item);
                 mat[12] = 0;
                 mat[13] = 0;
                 mat[14] = 0;
 
-                dist = this._undoArray[i].dist;
+                dist = ElementsMediator.getPerspectiveDist(item);
 
                 var previousStyleStr = {dist:dist, mat:item.mat};
 
@@ -125,8 +124,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         this.isDrawing = false;
             this.endDraw(event);
 
-//                      this.UpdateSelection(true);
-                        this.Configure(true);
+
+            // Need to force stage to draw immediately so the new selection center is calculated
+            this.application.ninja.stage.draw();
+            // And captureSelectionDrawn to draw the transform handles
+            this.captureSelectionDrawn(null);
                 }
         },
 
@@ -201,8 +203,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
         },
 
         _updateTargets: {
-                value: function(addToUndoStack)
+                value: function(addToUndoStack) {
+        {
                 {
+//            console.log( "_updateTargets" );
+            console.log( "_updateTargets" );
                         //console.log( "_updateTargets" );
                         var newStyles = [],
                                 previousStyles = [],