diff options
author | Graham Linden <graham@lindenlab.com> | 2019-02-21 16:03:46 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-02-21 16:03:46 -0800 |
commit | 788a108384a27abf343a1e9ebf5f2437a75552a2 (patch) | |
tree | 652beb9742c62c75cebada1ee4404013a23d6645 /indra/newview/llviewershadermgr.cpp | |
parent | 5ff4580cbb950b82cdcec6574b3292ea3d67ac21 (diff) |
SL-10501
Fix broken matrix management code causing modelview mats to be used as tex anim mats
(do not depend on default matrix mode already being set).
Give the deferred terrain shader a name.
Make LLRender use the eMatrixMode enum instead of ints.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 2a712d68e4..8a69376fe1 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2194,7 +2194,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() if (success) { - gTerrainProgram.mName = "Deferred Terrain Shader"; + gDeferredTerrainProgram.mName = "Deferred Terrain Shader"; gDeferredTerrainProgram.mFeatures.encodesNormal = true; gDeferredTerrainProgram.mShaderFiles.clear(); gDeferredTerrainProgram.mShaderFiles.push_back(make_pair("deferred/terrainV.glsl", GL_VERTEX_SHADER_ARB)); |