diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-08 15:52:54 -0700 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-08 15:52:54 -0700 |
commit | 5ee461ab19ac86ef9712ad33435b821f9afe340c (patch) | |
tree | 44a7aa3deeb30264dc181271c663cb0c08cb1bc3 /indra/newview/lldrawpool.cpp | |
parent | 225ac5c487548ba7e62f3e15f1b941baba3a433c (diff) | |
parent | 337976096530729a7d671df68907cd59a7986972 (diff) |
merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
-rw-r--r-- | indra/newview/lldrawpool.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 013c698445..94dd927d26 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -419,6 +419,7 @@ void LLRenderPass::applyModelMatrix(LLDrawInfo& params) gGL.loadMatrix(gGLModelView); if (params.mModelMatrix) { + llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW); gGL.multMatrix((GLfloat*) params.mModelMatrix->mMatrix); } gPipeline.mMatrixOpCount++; |