diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:45:15 -0700 |
| commit | 99b99a1b4a21758ef888b251d8f8bbf565f8b42e (patch) | |
| tree | 5c91eaa4a6dffd724cdb0cb8f4de8c11f82335a5 /indra/newview/llface.cpp | |
| parent | 0df59ff9e6e50237d36a976731e81c6e37e73933 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Clean up a merge conflict
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 4a802ad9aa..01d8b6775b 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->getDiffuseAlphaMode() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) + if (mat && mat->getDiffuseAlphaModeRender() == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) { return false; } @@ -1412,7 +1412,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; } |