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/llrender/llglslshader.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/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index faa1cd096c..3cc26b14bd 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -1190,6 +1190,8 @@ S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode, LLTex LL_SHADER_UNIFORM_ERRS() << "Uniform out of range: " << uniform << LL_ENDL; return -1; } + + S32 index = mTexture[uniform]; if (index != -1) { |