diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-09-19 13:45:39 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-09-19 13:45:39 -0700 |
| commit | 5b197db0c46b142f977670e3ca6aea9687622e78 (patch) | |
| tree | acbb40dfeb731d1f8b3f9d8656bd2ee28384b22c /indra/llrender/llshadermgr.cpp | |
| parent | 094a226fd8027405dd220dbc25951a3b70c9fa67 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Pull from lindenlab/viewer-release
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index fea4ee2819..63404abeff 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1137,11 +1137,13 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("projectionMap"); mReservedUniforms.push_back("global_gamma"); - mReservedUniforms.push_back("texture_gamma"); - + mReservedUniforms.push_back("texture_gamma"); + mReservedUniforms.push_back("specular_color"); mReservedUniforms.push_back("env_intensity"); + mReservedUniforms.push_back("display_gamma"); + llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); std::set<std::string> dupe_check; |