Merge branch 'main' into marchcat/c-merge

# Conflicts:
#	indra/newview/llviewermenufile.cpp

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();