diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-09-23 20:28:23 +0300 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2013-09-23 20:28:23 +0300 |
| commit | 089081dc802a8efb41d3eda7b2eec6f9637f1c4b (patch) | |
| tree | 6d08c1ef1cd3691ab225a0c281d002b9d2af62cb /indra/llrender/llshadermgr.cpp | |
| parent | 3e934d5089abacbfb1c7bfbaff4a2d415587bfbb (diff) | |
| parent | 3bfac42f07b1896bea3fd1ece762c56e3f1fc819 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index d1afd2ed28..d230574752 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1137,7 +1137,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("lightMap"); mReservedUniforms.push_back("bloomMap"); mReservedUniforms.push_back("projectionMap"); - + mReservedUniforms.push_back("norm_mat"); + mReservedUniforms.push_back("global_gamma"); mReservedUniforms.push_back("texture_gamma"); @@ -1183,7 +1184,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("alpha_ramp"); mReservedUniforms.push_back("origin"); - + mReservedUniforms.push_back("display_gamma"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); std::set<std::string> dupe_check; |