diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-19 16:04:28 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-19 16:04:28 -0700 |
| commit | 8675ed0491efee860ac1b2d1d5fe88d150768217 (patch) | |
| tree | 1a073cf8193272f150dfd629c5ed4c9c4b9b5c6e /indra/newview/lldrawpoolalpha.cpp | |
| parent | 8de09e474411741cb206f7df595c21bfaa28ce4e (diff) | |
Fix merge regressions from missed changes to LoD updates
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolalpha.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 500fad4f78..e4ebfea665 100755 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -399,7 +399,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass) // Fix for bug - NORSPEC-271 // If the face is more than 90% transparent, then don't update the Depth buffer for Dof // We don't want the nearly invisible objects to cause of DoF effects - if(pass == 1) + if(pass == 1 && !LLPipeline::sImpostorRender) { LLFace* face = params.mFace; if(face) @@ -577,7 +577,6 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass) // If this alpha mesh has glow, then draw it a second time to add the destination-alpha (=glow). Interleaving these state-changing calls could be expensive, but glow must be drawn Z-sorted with alpha. if (current_shader && - !LLPipeline::sImpostorRender && draw_glow_for_this_partition && params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE)) { |