diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
| commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
| tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/llface.cpp | |
| parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
DRTVWR-538: Merge branch 'master' into c++17
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; } |