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, 4 insertions, 4 deletions

diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index d023206a..6aea77aa 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -39,7 +39,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                         return this._clickedObject;
                 },
                 set: function (value) {
-                        if(value === this.application.ninja.currentDocument.documentRoot)
+                        if(value === this.application.ninja.currentDocument.model.documentRoot)
                         {
                                 this._clickedObject = this._target;
                         }
@@ -64,7 +64,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
         value: function(hitRec)
         {
             var elt = hitRec.getElt();
-            if(elt === this.application.ninja.currentDocument.documentRoot)
+            if(elt === this.application.ninja.currentDocument.model.documentRoot)
             {
                 elt = this._target;
             }
@@ -531,7 +531,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 
                         snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel()     );
                         if ( snapManager.snapAlignEnabled() && this._clickedObject &&
-                (this._clickedObject !== this.application.ninja.currentDocument.documentRoot) )
+                (this._clickedObject !== this.application.ninja.currentDocument.model.documentRoot) )
                         {
                                 var alignBounds = !hitRec || (hitRec.getType() == hitRec.SNAP_TYPE_STAGE) || hitRec.isSomeGridTypeSnap();
                                 if (alignBounds)
@@ -776,7 +776,7 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
                                 }
                                 else
                                 {
-                                        this.target = this.application.ninja.currentDocument.documentRoot;
+                                        this.target = this.application.ninja.currentDocument.model.documentRoot;
                                 }
 //                              this._updateTargets();
                         }