aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D/snap-manager.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-11 08:55:46 -0700
committerPushkar Joshi2012-05-11 08:55:46 -0700
commitd7d6f03257f9e938321cfea0e9f98e99cca7c397 (patch)
tree05f89cf903b26cab6233dc6dfa7c6f18b5947c2c /js/helper-classes/3D/snap-manager.js
parentde9f718b739ef2b31a161d9dac6e81d614fab853 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d7d6f03257f9e938321cfea0e9f98e99cca7c397.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js4
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