diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-07 15:26:41 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-07 15:26:41 -0800 |
| commit | a237325ad64d0930340e2a6f82d4042797ed8e68 (patch) | |
| tree | 3259746274acc6a0fc29f29a897271ea199d9381 /indra/llrender/llshadermgr.cpp | |
| parent | 8740c54fb074b8ab2349dc5a3317e1578de3d812 (diff) | |
| parent | 2d8152afd9c6077b5eda8d139521a4e3c1328775 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 11e84d8785..ec8f05e4ca 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -791,7 +791,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } */ - extra_code_text[extra_code_count++] = strdup("#define HAS_DIFFUSE_LOOKUP 1\n"); + extra_code_text[extra_code_count++] = strdup("#define HAS_DIFFUSE_LOOKUP\n"); //uniform declartion for (S32 i = 0; i < texture_index_channels; ++i) @@ -850,11 +850,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade LL_ERRS() << "Indexed texture rendering requires GLSL 1.30 or later." << LL_ENDL; } } - else - { - extra_code_text[extra_code_count++] = strdup("#define HAS_DIFFUSE_LOOKUP 0\n"); - } - //copy file into memory enum { |