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/llface.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/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 01d8b6775b..4a802ad9aa 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1165,7 +1165,7 @@ bool LLFace::canRenderAsMask() } LLMaterial* mat = te->getMaterialParams(); - if (mat && mat->getDiffuseAlphaModeRender() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + if (mat && mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) { return false; } @@ -1412,7 +1412,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } else { - if (!mat || mat->getDiffuseAlphaModeRender() != LLMaterial::DIFFUSE_ALPHA_MODE_MASK) + if (!mat || mat->getDiffuseAlphaMode() != LLMaterial::DIFFUSE_ALPHA_MODE_MASK) { shiny_in_alpha = true; } |