diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-07-23 23:08:03 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-07-23 23:08:03 -0600 |
| commit | 073a207ab902dc0589a30af234a4798e914a731a (patch) | |
| tree | 60e3c382bc457f77f0b886beacd5a56885772169 /indra/llmath | |
| parent | 50c472c24216ad0c3890cb8bb9cf638e75642f0c (diff) | |
| parent | 52f292c0637545171749aee18e305c530a76d096 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | indra/llmath/llvolume.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 7867d2c546..41914446d1 100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -7276,9 +7276,6 @@ void CalculateTangentArray(U32 vertexCount, const LLVector4a *vertex, const LLVe LLVector4a n = normal[a]; const LLVector4a& t = tan1[a]; - - llassert(tan1[a].getLength3().getF32() >= 0.f); - llassert(tan2[a].getLength3().getF32() >= 0.f); LLVector4a ncrosst; ncrosst.setCross3(n,t); @@ -7299,18 +7296,8 @@ void CalculateTangentArray(U32 vertexCount, const LLVector4a *vertex, const LLVe tsubn.getF32ptr()[3] = handedness; tangent[a] = tsubn; - - /* - These are going off on invalid input and hindering other debugging. - llassert(llfinite(tangent[a].getF32ptr()[0])); - llassert(llfinite(tangent[a].getF32ptr()[1])); - llassert(llfinite(tangent[a].getF32ptr()[2])); - - llassert(!llisnan(tangent[a].getF32ptr()[0])); - llassert(!llisnan(tangent[a].getF32ptr()[1])); - llassert(!llisnan(tangent[a].getF32ptr()[2]));*/ - } - else + } + else { //degenerate, make up a value tangent[a].set(0,0,1,1); } |