summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
committerKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
commitc309a7bd9446cc942830998b1f5873cc62e9dffb (patch)
treebbfe0d41ebc7e303db1bd95c419f604e04fb9ab2 /indra/newview/lldrawpoolavatar.cpp
parentca790f7320c9fc6c43e8c6022c9e511a85fd1c9d (diff)
parent3feacc96c6cf87f1be034312d8c71d21bae88351 (diff)
Merge with viewer-materials tip
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 730ad1a364..0e15f474c9 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1630,6 +1630,7 @@ void LLDrawPoolAvatar::renderRiggedAlpha(LLVOAvatar* avatar)
LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
renderRigged(avatar, RIGGED_ALPHA);
+ gGL.setColorMask(true, false);
}
}
@@ -1646,6 +1647,7 @@ void LLDrawPoolAvatar::renderRiggedFullbrightAlpha(LLVOAvatar* avatar)
LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA);
+ gGL.setColorMask(true, false);
}
}