diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
| commit | 730d94779c0e798ec91b269b530a08f0eebaa13d (patch) | |
| tree | d4821d194caef6e71f3e31b578fde635a38bdb3b /indra/llrender/llglslshader.cpp | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
| parent | 9f97ff7286aceef5be4e7589ca4af911edf30f12 (diff) | |
Merge release/materials_featurette to main on promotion of secondlife/viewer #648: Release/materials featurette
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 97759939c9..28b5bc7495 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) { |