diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-03-24 14:05:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-03-24 14:05:28 -0500 |
| commit | 7aa2aeca93a4ac881c48e59bfc59a9ae9849ac62 (patch) | |
| tree | beedb56c6ccb444b0933b194f765a3f6ce707d1f /indra/newview/llface.cpp | |
| parent | 5a76ebc069f86b4e31e74512dba0af2edaa6f628 (diff) | |
| parent | 3d80a0858d97012bf24cfb26e4053369c41b068e (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llface.cpp')
| -rwxr-xr-x | indra/newview/llface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index ae62be0ad0..d69c185a2b 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1638,7 +1638,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, do_xform = false; } - if (getVirtualSize() >= MIN_TEX_ANIM_SIZE) + if (getVirtualSize() >= MIN_TEX_ANIM_SIZE || isState(LLFace::RIGGED)) { //don't override texture transform during tc bake tex_mode = 0; } |