diff options
| author | Tofu Buzzard <no-email> | 2011-02-01 09:44:47 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-01 09:44:47 -0800 |
| commit | 7ddf7e17c01242901cef9219e27077e0d1243997 (patch) | |
| tree | 3e256a2e6af59ebed663e8d5bdd31f3b73e1e02d /indra/newview/llface.cpp | |
| parent | 622c5f11306c88055fc1be0a290041ef7e3394a4 (diff) | |
| parent | c7d0fab7b9279c5f6a57ee3de103b8fb142fb747 (diff) | |
merge
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 15f59e84a6..1576ef0769 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1374,7 +1374,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLVector4a& norm = vf.mNormals[i]; LLVector4a& center = *(vf.mCenter); - + if (texgen != LLTextureEntry::TEX_GEN_DEFAULT) { LLVector4a vec = vf.mPositions[i]; @@ -1598,7 +1598,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, mTexExtents[0].setVec(0,0); mTexExtents[1].setVec(1,1); xform(mTexExtents[0], cos_ang, sin_ang, os, ot, ms, mt); - xform(mTexExtents[1], cos_ang, sin_ang, os, ot, ms, mt); + xform(mTexExtents[1], cos_ang, sin_ang, os, ot, ms, mt); + + F32 es = vf.mTexCoordExtents[1].mV[0] - vf.mTexCoordExtents[0].mV[0] ; + F32 et = vf.mTexCoordExtents[1].mV[1] - vf.mTexCoordExtents[0].mV[1] ; + mTexExtents[0][0] *= es ; + mTexExtents[1][0] *= es ; + mTexExtents[0][1] *= et ; + mTexExtents[1][1] *= et ; } mLastVertexBuffer = mVertexBuffer; |