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/pipeline.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/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 9f80f85750..490738d304 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4746,6 +4746,7 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera, bool do_occlusion) LL_RECORD_BLOCK_TIME(FTM_POST_DEFERRED_POOLRENDER); gGLLastMatrix = NULL; + gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.loadMatrix(gGLModelView); for( S32 i = 0; i < poolp->getNumPostDeferredPasses(); i++ ) |