diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-05-26 18:53:28 +0000 |
| commit | 4cb5d10a3fe746ce5eb41da355ebceaebc460f26 (patch) | |
| tree | ea062b13c8e53ca8d040d6377d0e40d28070c654 /indra/newview/lldrawpoolavatar.cpp | |
| parent | 272da688f75880f73e227ae62bad1c5a9b28b288 (diff) | |
| parent | 7199ce45142f47003ba04381a76c1a4c7545f127 (diff) | |
Merged in euclid-15299 (pull request #580)
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 55b3864b6d..687b13d2c8 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -2129,7 +2129,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) if (mat) { - switch (LLMaterial::eDiffuseAlphaMode(mat->getDiffuseAlphaModeRender())) + switch (LLMaterial::eDiffuseAlphaMode(mat->getDiffuseAlphaMode())) { case LLMaterial::DIFFUSE_ALPHA_MODE_MASK: { @@ -2267,7 +2267,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) sVertexProgram->uniform4f(LLShaderMgr::SPECULAR_COLOR, col.mV[0], col.mV[1], col.mV[2], spec); sVertexProgram->uniform1f(LLShaderMgr::ENVIRONMENT_INTENSITY, env); - if (mat->getDiffuseAlphaModeRender() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK) + if (mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_MASK) { F32 cutoff = mat->getAlphaMaskCutoff()/255.f; sVertexProgram->setMinimumAlpha(cutoff); |