diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-17 17:19:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-17 17:19:13 -0600 |
| commit | a5bc626ee32765774066397e803cc01bd663380c (patch) | |
| tree | f91e68142e10a70e3980bbc6dc1accd1bf36ad0c /indra/newview/lldrawpoolavatar.cpp | |
| parent | c05f3d384b747cfc2c732bad139e12e834507cf9 (diff) | |
| parent | 9e0ee4dff0109326c31425581437a44351d08344 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index fbf39ee91e..b044a89af8 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -507,6 +507,11 @@ void LLDrawPoolAvatar::beginRenderPass(S32 pass) //reset vertex buffer mappings LLVertexBuffer::unbind(); + if (pass == 0) + { //make sure no stale colors are left over from a previous render + glColor4f(1,1,1,1); + } + if (LLPipeline::sImpostorRender) { //impostor render does not have impostors or rigid rendering pass += 2; @@ -1129,8 +1134,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) return; } - LLOverrideFaceColor color(this, 1.0f, 1.0f, 1.0f, 1.0f); - if (pass == 0) { if (!LLPipeline::sReflectionRender) |