diff options
author | Stinson Linden <stinson@lindenlab.com> | 2014-05-19 22:19:55 +0100 |
---|---|---|
committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-19 22:19:55 +0100 |
commit | babd89b77050ab49166f2fbd6d460884070140d9 (patch) | |
tree | dd3039e009f3e0f7ca2de578f4599e79ca15a1dc /indra/newview/llface.cpp | |
parent | 08e83a341e76de8fa4d8c4a974edbe3e0bd1c128 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
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 0b080cbdd7..32b510b21a 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; } |