From 47be24e467a9fe5a2c0466a49f58769f6b81fdc4 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Thu, 15 Jun 2023 14:51:57 -0500 Subject: SL-19835 Followup -- fix for emissive alpha objects blocking water rendering --- indra/newview/lldrawpoolalpha.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/lldrawpoolalpha.cpp') 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) -- cgit v1.2.3