diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-15 15:41:24 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-15 15:41:24 -0700 |
| commit | 3cb329d4fa53df9ab1ab371f26a178ef48ae3ca3 (patch) | |
| tree | b07ac60e9dcfbc93a86f7c0755e497978b3bba6e /indra/newview/llface.cpp | |
| parent | 6252449cd392918d976f0af0317c44688e052b32 (diff) | |
| parent | 29be88d60d654193926add496d2d851f7c217356 (diff) | |
Merge commit '29be88d60d654193926add496d2d851f7c217356' into project/gltf_development
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 6ef0894ae4..fa7b5f2b17 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1261,11 +1261,11 @@ bool LLFace::getGeometryVolume(const LLVolume& volume, { color = tep->getGLTFRenderMaterial()->mBaseColor; } - - if (rebuild_color) + + if (rebuild_color) { //decide if shiny goes in alpha channel of color if (tep && - !isInAlphaPool()) // <--- alpha channel MUST contain transparency, not shiny + !isInAlphaPool() && tep->getGLTFRenderMaterial() == nullptr) // <--- alpha channel MUST contain transparency, not shiny { LLMaterial* mat = tep->getMaterialParams().get(); |