diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-07 08:40:10 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-07 08:40:10 -0800 |
| commit | 5bdc941b431ffd7757897d7982ebcfbf01119f09 (patch) | |
| tree | cc9bc57127c460952952b439972793a2eac6166c /indra/newview/lldrawpool.cpp | |
| parent | 8890c3238ab4ae8bbf1bc123284f9c6d4db4f9d6 (diff) | |
Fix apply of model matrix expecting upstream code to be in the correct matrix mode
(which was not true as the assert on same fired).
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 00493c83df..b7504b16bf 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -449,10 +449,10 @@ void LLRenderPass::applyModelMatrix(const LLDrawInfo& params) if (params.mModelMatrix != gGLLastMatrix) { gGLLastMatrix = params.mModelMatrix; + gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.loadMatrix(gGLModelView); if (params.mModelMatrix) { - llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW); gGL.multMatrix((GLfloat*) params.mModelMatrix->mMatrix); } gPipeline.mMatrixOpCount++; |