diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-11 16:51:06 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-11 16:51:06 -0800 |
| commit | d5aba3988291a2929f4b894d91250e75ffde3d8e (patch) | |
| tree | d6360cee0c52097840412c978e039bfd69eced70 /indra/newview/lldrawpool.cpp | |
| parent | 2a740309d01ca2ab80fd054ea8d8a79fb7ebbbe0 (diff) | |
| parent | 5433ed60ac93c6ccc7692ad43d579a83ab544f31 (diff) | |
Merge
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++; |