diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-06-11 12:33:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 12:33:53 -0400 |
| commit | e92689063bdbe34907348a12f1db39bc81132783 (patch) | |
| tree | 3d7b76e4f82fbb147e6c07f104fb85c55246fd99 /indra/newview/llface.cpp | |
| parent | f3bfc13f7957a5f142871bddc57d63cd08595ad9 (diff) | |
| parent | b5546377b0aa2482756b1dad4258659edc630c3b (diff) | |
Merge pull request #1697 from secondlife/lua-bradfix
Merge promoted Featurettes + Brad's GitHub Windows build workaround.
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 5e2d7f70cf..4c26e6b8af 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1265,7 +1265,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(); @@ -1855,7 +1855,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(); |