diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-05-23 12:49:23 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-05-23 12:49:23 -0500 |
| commit | e6de3d6232a12ace8f669abd4ede4c6f586046df (patch) | |
| tree | bd82478ab3e39ad0caf655806960975c86bb141d /indra/llrender | |
| parent | 74a84738ed8779e345f34b95f029862b3c9ccf6e (diff) | |
| parent | 6a9564eeadf54937a63d60e265cf304e6f81dc01 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 1 | ||||
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index ef78d43665..874996dd10 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1068,6 +1068,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("minimum_alpha"); + mReservedUniforms.push_back("emissive_brightness"); mReservedUniforms.push_back("shadow_matrix"); mReservedUniforms.push_back("env_mat"); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index a33eca4448..c049e935b8 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -109,6 +109,7 @@ public: GLOW_DELTA, MINIMUM_ALPHA, + EMISSIVE_BRIGHTNESS, DEFERRED_SHADOW_MATRIX, DEFERRED_ENV_MAT, |