diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-20 11:47:15 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-20 11:47:15 +0100 |
| commit | 9c779e222eb6f929003e2cce446850dfbc306063 (patch) | |
| tree | 2837aacd1966ea429ea450bb7869e5b6595db309 /indra/newview/llface.cpp | |
| parent | 02fe5d60c0a6664bb86254347ce31467da2d90c3 (diff) | |
| parent | ae0dbecb1c93347f7d83760117496048af3148da (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index f6932b0e68..6a1a9dd4e1 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1399,9 +1399,18 @@ F32 LLFace::getTextureVirtualSize() texel_area = 1.f; } - //apply texel area to face area to get accurate ratio - //face_area /= llclamp(texel_area, 1.f/64.f, 16.f); - F32 face_area = mPixelArea / llclamp(texel_area, 0.015625f, 128.f); + F32 face_area; + if (mVObjp->isSculpted() && texel_area > 1.f) + { + //sculpts can break assumptions about texel area + face_area = mPixelArea; + } + else + { + //apply texel area to face area to get accurate ratio + //face_area /= llclamp(texel_area, 1.f/64.f, 16.f); + face_area = mPixelArea / llclamp(texel_area, 0.015625f, 128.f); + } if(face_area > LLViewerTexture::sMaxSmallImageSize) { |