diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
| commit | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (patch) | |
| tree | 31b2bf3eeb026334ed20cd6e4f8fb15f91a07b0f /indra/llappearance/lltexlayerparams.cpp | |
| parent | 5a6174c0853f5a140343725312f2b63b42f2bbad (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
DRTVWR-589: Merge branch 'main' into DRTVWR-589
Diffstat (limited to 'indra/llappearance/lltexlayerparams.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayerparams.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index a288c8955a..604e0124cb 100644 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp @@ -149,7 +149,7 @@ LLTexLayerParamAlpha::LLTexLayerParamAlpha(const LLTexLayerParamAlpha& pOther) mCachedProcessedTexture(pOther.mCachedProcessedTexture), mStaticImageTGA(pOther.mStaticImageTGA), mStaticImageRaw(pOther.mStaticImageRaw), - mNeedsCreateTexture(pOther.mNeedsCreateTexture), + mNeedsCreateTexture(pOther.mNeedsCreateTexture.load()), mStaticImageInvalid(pOther.mStaticImageInvalid), mAvgDistortionVec(pOther.mAvgDistortionVec), mCachedEffectiveWeight(pOther.mCachedEffectiveWeight) @@ -344,7 +344,6 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height) mCachedProcessedTexture->setAddressMode(LLTexUnit::TAM_CLAMP); } - LLGLSNoAlphaTest gls_no_alpha_test; gGL.getTexUnit(0)->bind(mCachedProcessedTexture); gl_rect_2d_simple_tex(width, height); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); @@ -361,7 +360,6 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height) } else { - LLGLDisable no_alpha(GL_ALPHA_TEST); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); gGL.color4f(0.f, 0.f, 0.f, effective_weight); gl_rect_2d_simple(width, height); |