diff options
author | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-23 00:34:37 -0800 |
commit | 3675cac3993430490d9eef18157314d53ffa1a6a (patch) | |
tree | fb225a6d8fc3c983c96b1507483d628909dc8c1e /js/helper-classes/3D | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
parent | 3730bbc7cc5d5f07b3d788885475a8f9810b480e (diff) | |
download | ninja-3675cac3993430490d9eef18157314d53ffa1a6a.tar.gz |
Merge pull request #60 from mqg734/WebGLMaterials
Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 0a950658..ada6960b 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1087,6 +1087,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1087 | 1087 | ||
1088 | // we need to check the orientation of the bounds | 1088 | // we need to check the orientation of the bounds |
1089 | var nrm = MathUtils.getNormalFromBounds3D( bounds3D ); | 1089 | var nrm = MathUtils.getNormalFromBounds3D( bounds3D ); |
1090 | if (MathUtils.fpSign(nrm[2]) == 0) return null; | ||
1090 | var zNrm = nrm[2]; | 1091 | var zNrm = nrm[2]; |
1091 | var dist; | 1092 | var dist; |
1092 | 1093 | ||