diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-12 12:19:48 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-12 12:19:48 -0700 |
| commit | 88553c9eb1aee59d092cbd73c64da82497fd095f (patch) | |
| tree | ee99d4aae0b2feccb8025057b562a32e886a7948 /indra/llappearance | |
| parent | b070bb1c2279189c45ee786e125134f067951bde (diff) | |
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llpolymorph.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp index 5e5813b9ac..93c2f15a53 100644 --- a/indra/llappearance/llpolymorph.cpp +++ b/indra/llappearance/llpolymorph.cpp @@ -568,12 +568,6 @@ void LLPolyMorphTarget::apply( ESex avatar_sex ) F32 *maskWeightArray = (mVertMask) ? mVertMask->getMorphMaskWeights() : NULL; - LLVector4a default_norm; - LLVector4a default_binorm; - - default_norm.set(0,1,0,1); - default_binorm.set(1,0,0,1); - for(U32 vert_index_morph = 0; vert_index_morph < mMorphData->mNumIndices; vert_index_morph++) { S32 vert_index_mesh = mMorphData->mVertexIndices[vert_index_morph]; @@ -606,7 +600,7 @@ void LLPolyMorphTarget::apply( ESex avatar_sex ) // guard against degenerate input data before we create NaNs below! // - norm.normalize3fast_checked(&default_norm); + norm.normalize3fast(); normals[vert_index_mesh] = norm; // calculate new binormals @@ -626,7 +620,7 @@ void LLPolyMorphTarget::apply( ESex avatar_sex ) LLVector4a& normalized_binormal = binormals[vert_index_mesh]; normalized_binormal.setCross3(norm, tangent); - normalized_binormal.normalize3fast_checked(&default_binorm); + normalized_binormal.normalize3fast(); tex_coords[vert_index_mesh] += mMorphData->mTexCoords[vert_index_morph] * delta_weight * maskWeight; } |