From 3bc4d6fd636a8243349d166e913b655866d4d699 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 17 Jul 2019 20:20:41 -0500 Subject: [PATCH] Fix UI backgrounds vanishing when toggling basic shaders on and off. --- indra/llrender/llgl.cpp | 2 +- indra/llrender/llrender.cpp | 2 +- indra/llrender/llrender.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index d4b2e8c97..c6b99ba67 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -110,7 +110,7 @@ void APIENTRY gl_debug_callback(GLenum source, { if (id == 0x20004 || // Silence nvidia glClear noop messages id == 0x20043 || // Silence nvidia CSAA messages. - id == 0x20084 // Silence nvidia textumre mapping with no base level messages. + id == 0x20084 // Silence nvidia texture mapping with no base level messages. ) { return; diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index e050437a6..f1d099bc0 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -455,7 +455,7 @@ void LLTexUnit::unbind(eTextureType type) { gGL.flush(); mCurrTexture = 0; - if (LLGLSLShader::sNoFixedFunction && type == LLTexUnit::TT_TEXTURE) + if (/*LLGLSLShader::sNoFixedFunction && */type == LLTexUnit::TT_TEXTURE) { //if (sWhiteTexture) // validate_bind_texture(sWhiteTexture); diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 058bf698f..82da74e26 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -391,7 +391,7 @@ public: Context() : texUnit(0), color{ 1.f,1.f,1.f,1.f }, - colorMask{ true }, + colorMask{ 0xf }, alphaFunc(CF_ALWAYS), alphaVal(0.f), blendColorSFactor(BF_ONE),