diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-18 14:37:10 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-18 14:37:10 -0700 |
| commit | 25e7f5ded1d6cd5f7e136c6023136dfc35b0e118 (patch) | |
| tree | 882948c18019e6c94ae2983fdf86d4a5d8303f98 /indra/llrender/llshadermgr.cpp | |
| parent | be84aefc40719dacb9ab2c0ace9a2a706d768ffc (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
merge changes for 3.6.6-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; |