diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:21:50 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:21:50 +0300 |
| commit | a9f70ec80e3799489ec265b2eedcf77d5dc0d342 (patch) | |
| tree | 0c90825f9a6768303587897a6fa844351607eb06 /indra/llrender/llshadermgr.cpp | |
| parent | f4bfaeb45e57ae0a62a47dc4f2759a34fe7a7581 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/lltexturectrl.h
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"); |