diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-30 17:54:59 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-30 17:54:59 +0100 |
| commit | 6dd9dd3ab63cb0daa7682a400ff0408fd894ba77 (patch) | |
| tree | 35b303a95601c39f0881c51a4f6f7753788c2d5e /indra/llrender/llglslshader.cpp | |
| parent | 51451e0b92177ee887ba8310e304bb30e90685a9 (diff) | |
MAINT-9064
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index ff79efcc5b..639033f143 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -799,12 +799,6 @@ BOOL LLGLSLShader::mapUniforms(const vector<LLStaticHashedString> * uniforms) continue; } - if (-1 == specularMap && std::string(name) == "specularMap") - { - specularMap = i; - continue; - } - if (-1 == bumpMap && std::string(name) == "bumpMap") { bumpMap = i; |