diff options
author | hwc487 | 2012-05-08 15:54:15 -0700 |
---|---|---|
committer | hwc487 | 2012-05-08 15:54:15 -0700 |
commit | 7af54816bb6311421f976661d07b7776d5cd37c9 (patch) | |
tree | fd5b734778b01a9c938b0094b8dd7291f6648d3d /js/helper-classes/3D/snap-manager.js | |
parent | 91a9e02bff0397ec9b1f55fdf61cef72eb0d8a0f (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-7af54816bb6311421f976661d07b7776d5cd37c9.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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 f4bfc12b..6766ac7f 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1957,6 +1957,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1957 | var localPt = hitRec.getLocalPoint(); | 1957 | var localPt = hitRec.getLocalPoint(); |
1958 | var planeMat = hitRec.getPlaneMatrix(); | 1958 | var planeMat = hitRec.getPlaneMatrix(); |
1959 | var stageWorldPt; | 1959 | var stageWorldPt; |
1960 | |||
1961 | /* | ||
1960 | if(inGlobalMode) | 1962 | if(inGlobalMode) |
1961 | { | 1963 | { |
1962 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); | 1964 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); |
@@ -1965,6 +1967,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1965 | { | 1967 | { |
1966 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | 1968 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); |
1967 | } | 1969 | } |
1970 | */ | ||
1971 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | ||
1968 | 1972 | ||
1969 | /* | 1973 | /* |
1970 | // get a working plane parallel to the current working plane through the stage world point | 1974 | // get a working plane parallel to the current working plane through the stage world point |