Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 11 insertions, 7 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 641ac247..4c1d046b 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -37,6 +37,10 @@ exports.Stage = Montage.create(Component, {
                 get: function()  {  return this.stageDeps.snapManager;  }
         },
 
+    drawUtils: {
+        get: function()  {  return this.stageDeps.drawUtils;  }
+    },
+
     resizeCanvases: {
         get: function() {
             return this._resizeCanvases;
@@ -144,12 +148,12 @@ exports.Stage = Montage.create(Component, {
 
     userContentLeft: {
         get: function() { return this._userContentLeft; },
-        set: function(value) { this._userContentLeft = value; }
+        set: function(value) { this._userContentLeft = value;}
     },
 
     userContentTop: {
         get: function() { return this._userContentTop; },
-        set: function(value) { this._userContentTop = value; }
+        set: function(value) { this._userContentTop = value;}
     },
 
     userContentBorder: {
@@ -258,6 +262,8 @@ exports.Stage = Montage.create(Component, {
             this.application.ninja.toolsData.selectedToolInstance._configure(true);
 
             this.addEventListener("change@appModel.show3dGrid", this, false);
+
+            this.layout.handleOpenDocument();
         }
     },
 
@@ -433,12 +439,11 @@ exports.Stage = Montage.create(Component, {
      */
     handleScroll: {
         value: function() {
-
             this._scrollLeft = this._iframeContainer.scrollLeft;
             this._scrollTop = this._iframeContainer.scrollTop;
 
-            this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
-            this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
+            this.userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
+            this.userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;
 
             // Need to clear the snap cache and set up the drag plane
             //snapManager.setupDragPlaneFromPlane( workingPlane );
@@ -446,7 +451,6 @@ exports.Stage = Montage.create(Component, {
 
             this.needsDraw = true;
             this.layout.draw();
-
             //this._toolsList.action("DrawHandles");
 
         }
@@ -519,7 +523,7 @@ exports.Stage = Montage.create(Component, {
                 elt = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop);
 
             // workaround Chrome 3d bug
-            if(this.application.ninja.currentDocument.inExclusion(elt) !== -1)
+            if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(elt) !== -1)
             {
                 return this._getElementUsingSnapping(point);
             } else {