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 | |
| parent | aa8f3d30704ea43a8fc2f9262a57968277c4db20 (diff) | |
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 1 |
2 files changed, 1 insertions, 3 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"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 82ce2dfff2..6ee95339f2 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -70,7 +70,6 @@ public: PROJECTOR_LOD, PROJECTOR_AMBIENT_LOD, DIFFUSE_COLOR, - HIGHLIGHT_COLOR, DIFFUSE_MAP, SPECULAR_MAP, BUMP_MAP, |