summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-05-20 10:03:09 -0700
committerdolphin <dolphin@lindenlab.com>2014-05-20 10:03:09 -0700
commit0481494c2df074d2b548d6b80e595a208a2848c3 (patch)
treef3554fc49b549a4ae2b9d1e9a5f157e478ee38df /indra/newview/llface.cpp
parent4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Merge with 3.7.8-release
Diffstat (limited to 'indra/newview/llface.cpp')
-rwxr-xr-xindra/newview/llface.cpp2
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;
}