Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/components/tools-properties/fill-properties.reel/fill-properties.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a793b643..eef28dce 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1217,7 +1217,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         var saveLineWidth = this._lineWidth;
 
                         var origLeft = 60;
-                        var origTop = this.snapManager.getStageHeight() - 60;
+                        var origTop = tmpCanvas.height - 60;
 
                         var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
                         var tMat = Matrix.Translation([origLeft,origTop,0]);