diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-30 18:15:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-30 18:15:26 +0100 |
| commit | e61fb73f38cbbbbb4728ae822484f88a37094715 (patch) | |
| tree | 2c09b2ea8488fa09891e7a70773a337ffa0bcccf /indra/llrender | |
| parent | 3b0ab35ac1325b164cc8ffa05d9ea4d3532ac40a (diff) | |
| parent | 6dd9dd3ab63cb0daa7682a400ff0408fd894ba77 (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -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; |