diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-07-26 17:49:41 -0400 |
| commit | 47f2c6bd52a9e929af8ccefa08d11ad18f05602b (patch) | |
| tree | 77d601c23539f576807f3e2cd8a62603b275905d /indra/llrender/llshadermgr.cpp | |
| parent | bea18c933bd97b838644f0d1738c633495b6b102 (diff) | |
| parent | 19640c015ecfefde767be49168684b27f5ceabb2 (diff) | |
merge callums latest changes
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 7d857c6930..55f0791174 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1190,7 +1190,6 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("origin"); mReservedUniforms.push_back("display_gamma"); - mReservedUniforms.push_back("invert_tex_y"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); std::set<std::string> dupe_check; |