diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
| commit | b8fa70502c5bc7bdb9dba7fde4251424a9041c9e (patch) | |
| tree | bd0f2d943fe615b089406e6e8896c3aadc72c10b /indra/newview/llface.cpp | |
| parent | 46309f558ed1ce459d11aa76de35679fa81a4823 (diff) | |
| parent | 5e353cbf86693ad18b0c9a3f75234c1fa6378005 (diff) | |
Merge
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 a1336815f7..e0e5b32299 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1376,9 +1376,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) { |