diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-06-30 01:30:14 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-06-30 01:30:14 +0000 |
| commit | 72ec01bbc178293a42f1e2c8536cc11aea1b9381 (patch) | |
| tree | 4c062dfb1c2e4a47bace4d8381afc95c8e50de21 /indra/llrender/llshadermgr.cpp | |
| parent | a9471433eb7d0aa28c3a5b248ad34d3df4c096e7 (diff) | |
| parent | ba1d4e508c011c14b5150a56aa14d2f3dd924ebd (diff) | |
Merged in SL-9632_part_2 (pull request #174)
SL-9632 part 2
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 1383020873..236ebbd78f 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1180,7 +1180,7 @@ void LLShaderMgr::initAttribsAndUniforms() llassert(mReservedUniforms.size() == LLShaderMgr::MULTI_LIGHT_FAR_Z+1); - + //NOTE: MUST match order in eGLSLReservedUniforms mReservedUniforms.push_back("proj_mat"); mReservedUniforms.push_back("proj_near"); mReservedUniforms.push_back("proj_p"); |