diff options
author | Valerio Virgillito | 2012-06-06 00:27:59 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 00:27:59 -0700 |
commit | 91123fef348ec54d89005adbc151e816856a6a18 (patch) | |
tree | ac20e473f2ef52ef1f7deb18eab4d38d6a35ec4b /js/helper-classes | |
parent | 0e1a276f19ea70009c5a649e9667861d7c346a7e (diff) | |
parent | 18e212dca48066d1ddaca96875a3f40adcc859b6 (diff) | |
download | ninja-91123fef348ec54d89005adbc151e816856a6a18.tar.gz |
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>
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 2 |
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, { | |||
1217 | var saveLineWidth = this._lineWidth; | 1217 | var saveLineWidth = this._lineWidth; |
1218 | 1218 | ||
1219 | var origLeft = 60; | 1219 | var origLeft = 60; |
1220 | var origTop = this.snapManager.getStageHeight() - 60; | 1220 | var origTop = tmpCanvas.height - 60; |
1221 | 1221 | ||
1222 | var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); | 1222 | var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); |
1223 | var tMat = Matrix.Translation([origLeft,origTop,0]); | 1223 | var tMat = Matrix.Translation([origLeft,origTop,0]); |