diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-09-30 15:41:51 -0700 |
| commit | a6c20ae524610de2f8681cff8353d062a69b923e (patch) | |
| tree | 929e4a253e4b83ca7e07543916e709d50fdf855e /indra/llrender/llshadermgr.cpp | |
| parent | 6c13c4dd552a05cf055a90bdd90937de9f3903a5 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
merging
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; |