diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-06-15 14:51:57 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-06-15 14:51:57 -0500 |
| commit | 47be24e467a9fe5a2c0466a49f58769f6b81fdc4 (patch) | |
| tree | 3d0627f8a0547f374f47481c04f3dfc286657265 /indra/newview/lldrawpoolalpha.cpp | |
| parent | 3305fbe1cf5fe3faa6dc5479aa29e6c891ee943f (diff) | |
SL-19835 Followup -- fix for emissive alpha objects blocking water rendering
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 060129d275..07b7be0fc8 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -649,8 +649,6 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) bool is_particle_or_hud_particle = group->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_PARTICLE || group->getSpatialPartition()->mPartitionType == LLViewerRegion::PARTITION_HUD_PARTICLE; - bool draw_glow_for_this_partition = mShaderLevel > 0; // no shaders = no glow. - bool disable_cull = is_particle_or_hud_particle; LLGLDisable cull(disable_cull ? GL_CULL_FACE : 0); @@ -818,7 +816,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) } // If this alpha mesh has glow, then draw it a second time to add the destination-alpha (=glow). Interleaving these state-changing calls is expensive, but glow must be drawn Z-sorted with alpha. - if (draw_glow_for_this_partition && + if (getType() != LLDrawPool::POOL_ALPHA_PRE_WATER && params.mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_EMISSIVE)) { if (params.mAvatar != nullptr) |