diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-10 11:39:08 -0600 |
| commit | c8f558f6775d62f03d6caab19668df80e95e8a8b (patch) | |
| tree | b74dd0d7e34bf670ebf59b2f37c6c7509f599d87 /indra/llrender/llshadermgr.cpp | |
| parent | aa8f3d30704ea43a8fc2f9262a57968277c4db20 (diff) | |
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index b390037a9c..e30ef73686 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -965,8 +965,7 @@ void LLShaderMgr::initAttribsAndUniforms() llassert(mReservedUniforms.size() == LLShaderMgr::PROJECTOR_AMBIENT_LOD+1); mReservedUniforms.push_back("color"); - mReservedUniforms.push_back("highlight_color"); - + mReservedUniforms.push_back("diffuseMap"); mReservedUniforms.push_back("specularMap"); mReservedUniforms.push_back("bumpMap"); |