summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpool.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-12-01 15:59:02 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-12-01 15:59:02 +0000
commit3f82f7ce3d4fb51407f366b2ad2f15d990de40b2 (patch)
tree45be0f3213f0e095d9a7929c693f4671c8b58e08 /indra/newview/lldrawpool.cpp
parent01317a2faded53c79db7e0814426f1d8b2fd12fc (diff)
parentabd7d80048529fd971e1b65ea3afe0f7e78bd356 (diff)
Merged in euclid-pre-16386 (pull request #793)
Purge LLGLSLShader::sNoFixedFunction, and all that flows from it. No functional changes. Approved-by: Michael Pohoreski Approved-by: Dave Parks
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
-rw-r--r--indra/newview/lldrawpool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index 92a9bed504..bad0c66fb1 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -493,7 +493,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, U32 mask, BOOL texture, BOOL
}
else
{
- gGL.setAlphaRejectSettings(LLRender::CF_GREATER, pparams->mAlphaMaskCutoff);
+ gGL.flush();
}
if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)