diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-15 18:20:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 18:20:47 +0300 |
| commit | 847a8458ecbcefd989a02c727e50f96c606d9d39 (patch) | |
| tree | 1561a55fe1e62356089d4912cd8216cc15b57e09 /indra/newview/llface.cpp | |
| parent | c4fc76efefd12c7cb1224dc8a748da2958f4a7f0 (diff) | |
| parent | bfadb935560003e94197a0c9532a7ba086c6720a (diff) | |
Merge pull request #1774 from secondlife/marchcat/b-merge
Release (Materials featurette) -> Maint B sync
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 6a3c931e9e..30b48df362 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1258,7 +1258,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, 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(); @@ -1848,7 +1848,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, S32* vp = (S32*) &val; *vp = index; - llassert(index <= LLGLSLShader::sIndexedTextureChannels-1); + llassert(index < LLGLSLShader::sIndexedTextureChannels); LLVector4Logical mask; mask.clear(); |