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/stage/tool-handle.js b/js/stage/tool-handle.js
index 63cf30e5..70289512 100755
--- a/js/stage/tool-handle.js
+++ b/js/stage/tool-handle.js
@@ -243,7 +243,7 @@ exports.RotateHandle = Montage.create(ToolHandle, {
             this._origin = pointOnElt;
 
 
-            var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.documentRoot);
+            var viewMat = viewUtils.getMatrixFromElement(this.application.ninja.currentDocument.model.documentRoot);
 
             var transMat = viewMat.slice(0);
             if(inLocalMode)
@@ -585,7 +585,7 @@ exports.TranslateHandle = Montage.create(ToolHandle, {
             this._origin = pointOnElt;
 
 
-            var stage = this.application.ninja.currentDocument.documentRoot;
+            var stage = this.application.ninja.currentDocument.model.documentRoot;
             var viewMat = viewUtils.getMatrixFromElement(stage);
             // Get viewMat without zoom value
             var zoom = this.application.ninja.documentBar.zoomFactor/100;