diff options
author | Armen Kesablyan | 2012-05-14 11:45:11 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-14 11:45:11 -0700 |
commit | 9e6c0a247bd2f14d92278bcd97fff40277b71667 (patch) | |
tree | 4194388c03814b9168922dbf2907edf426295874 /js/helper-classes/3D/snap-manager.js | |
parent | 9fc3b70bf57e10846e71808c6041fbc339a435d1 (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-9e6c0a247bd2f14d92278bcd97fff40277b71667.tar.gz |
Merge branch 'refs/heads/masterDomArc' into binding
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 31e3e540..5a36e367 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1949,6 +1949,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1949 | var localPt = hitRec.getLocalPoint(); | 1949 | var localPt = hitRec.getLocalPoint(); |
1950 | var planeMat = hitRec.getPlaneMatrix(); | 1950 | var planeMat = hitRec.getPlaneMatrix(); |
1951 | var stageWorldPt; | 1951 | var stageWorldPt; |
1952 | |||
1953 | /* | ||
1952 | if(inGlobalMode) | 1954 | if(inGlobalMode) |
1953 | { | 1955 | { |
1954 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); | 1956 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); |
@@ -1957,6 +1959,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1957 | { | 1959 | { |
1958 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | 1960 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); |
1959 | } | 1961 | } |
1962 | */ | ||
1963 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | ||
1960 | 1964 | ||
1961 | /* | 1965 | /* |
1962 | // get a working plane parallel to the current working plane through the stage world point | 1966 | // get a working plane parallel to the current working plane through the stage world point |