diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-01 21:53:44 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-01 21:53:44 +0000 |
| commit | 6eb180f790c248005bafb8cfb87bb5f575ee129e (patch) | |
| tree | 0cd461cd6304901f2a82db8d6f40593771343985 /indra/llrender | |
| parent | e1627330c9d568abca65c2451919c5a6e55dfec3 (diff) | |
| parent | 8b4a86db298335de52db114d63a153808dfde36a (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #261)
SL-9996, SL-1130, SL-5546
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 807e41dc97..3989c1e2e4 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1350,7 +1350,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("sh_input_g"); mReservedUniforms.push_back("sh_input_b"); - mReservedUniforms.push_back("sun_up_factor"); + mReservedUniforms.push_back("sun_moon_glow_factor"); mReservedUniforms.push_back("water_edge"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 8651265834..ef6f33f2e5 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -248,7 +248,7 @@ public: SH_INPUT_L1G, SH_INPUT_L1B, - SUN_UP_FACTOR, + SUN_MOON_GLOW_FACTOR, WATER_EDGE_FACTOR, END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |