diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:06 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:06 +0300 |
| commit | 58b4afa0ba83891482851b67965d1b1dd5b7de76 (patch) | |
| tree | 6b3d4e1ed0b6c13fb3acb838214a70b5a2ef3fa4 /indra/newview/llface.cpp | |
| parent | c8977fd904df10f225915ac5527d279440356257 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-530-maint
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 f1b64a5899..67ad7967a6 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1172,7 +1172,7 @@ bool LLFace::canRenderAsMask() } LLMaterial* mat = te->getMaterialParams(); - if (mat && mat->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + if (mat && mat->getDiffuseAlphaModeRender() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) { return false; } @@ -1419,7 +1419,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } else { - if (!mat || mat->getDiffuseAlphaMode() != LLMaterial::DIFFUSE_ALPHA_MODE_MASK) + if (!mat || mat->getDiffuseAlphaModeRender() != LLMaterial::DIFFUSE_ALPHA_MODE_MASK) { shiny_in_alpha = true; } |