diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
| commit | de34937c50492cb9d79859af000554d876ef7267 (patch) | |
| tree | 71afaf9dc2caf91d843a34fd8691055d93cd7f49 /indra/llrender | |
| parent | 198b3b6b99f494543c62b4e0923c14931fd4ab00 (diff) | |
| parent | 89a9eb1e54bbc421006ade44ba048b00e0a5a4a3 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #143)
SL-1925
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index e483f723f0..8617b58d2e 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1276,8 +1276,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("refTex"); mReservedUniforms.push_back("eyeVec"); mReservedUniforms.push_back("time"); - mReservedUniforms.push_back("d1"); - mReservedUniforms.push_back("d2"); + mReservedUniforms.push_back("waveDir1"); + mReservedUniforms.push_back("waveDir2"); mReservedUniforms.push_back("lightDir"); mReservedUniforms.push_back("specular"); mReservedUniforms.push_back("lightExp"); |