summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorChris Baker <baker@lindenlab.com>2014-06-16 21:15:41 +0000
committerChris Baker <baker@lindenlab.com>2014-06-16 21:15:41 +0000
commitee14005a2aea89b2988fa0a5060f38b669e45389 (patch)
tree3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llface.cpp
parenta92dbb592b338f48f7b75b68a9da511dc95279f9 (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
viewer-release merge
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;
}