diff options
| author | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
| commit | 354930014bc90a9c92b33300e5ecaf7fa861fe7b (patch) | |
| tree | b8ba1be3ae740aaa0db8ca7d639c78ce35c5918d /indra/llrender/llshadermgr.cpp | |
| parent | 6be1f88a5ef99e1e40bb5701a250ba0728f56005 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge with tip of Release
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"); |