diff options
author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/helper-classes/3D/snap-2d-record.js | |
parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/helper-classes/3D/snap-2d-record.js')
-rwxr-xr-x | js/helper-classes/3D/snap-2d-record.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/3D/snap-2d-record.js b/js/helper-classes/3D/snap-2d-record.js index c77b28b3..844bb3be 100755 --- a/js/helper-classes/3D/snap-2d-record.js +++ b/js/helper-classes/3D/snap-2d-record.js | |||
@@ -78,7 +78,7 @@ var Snap2DRecord = exports.Snap2DRecord = Object.create(Object.prototype, | |||
78 | 78 | ||
79 | // add the center point | 79 | // add the center point |
80 | var xCtr = 0.5*(bounds[0][0] + bounds[3][0]), yCtr = 0.5*(bounds[0][1] + bounds[1][1]); | 80 | var xCtr = 0.5*(bounds[0][0] + bounds[3][0]), yCtr = 0.5*(bounds[0][1] + bounds[1][1]); |
81 | var ctr = Vector.create( [xCtr, yCtr, 0] ); | 81 | var ctr = [xCtr, yCtr, 0]; |
82 | this._screenPtArray[4] = viewUtils.localToGlobal( ctr, elt ); | 82 | this._screenPtArray[4] = viewUtils.localToGlobal( ctr, elt ); |
83 | var worldPt = viewUtils.localToStageWorld( ctr, elt ); | 83 | var worldPt = viewUtils.localToStageWorld( ctr, elt ); |
84 | this._alignPtArray[4] = MathUtils.transformPoint( worldPt, snapManager.SnapManager._worldToDragPlane ); | 84 | this._alignPtArray[4] = MathUtils.transformPoint( worldPt, snapManager.SnapManager._worldToDragPlane ); |