Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index f81ce6d6..8437ec09 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -296,7 +296,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                     //this._setTransformOrigin(false);
                 }
                 else {
-                    this.target = this.application.ninja.currentDocument.documentRoot;
+                    this.target = this.application.ninja.currentDocument.model.documentRoot;
                     //this._origin = drawUtils._selectionCtr.slice(0);
                     //this._origin[0] += this.application.ninja.stage.userContentLeft;
                     //this._origin[1] += this.application.ninja.stage.userContentTop;
@@ -407,7 +407,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         else
                         {
                                 lMode = false;
-                                viewUtils.pushViewportObj( this.application.ninja.currentDocument.documentRoot );
+                                viewUtils.pushViewportObj( this.application.ninja.currentDocument.model.documentRoot );
                         }
 
                         if(this._handleMode !== null)