diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
| commit | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (patch) | |
| tree | e777c21cf2a9e1d2a115c96bff080ebe2d0edb31 /indra/newview/lldrawpooltree.cpp | |
| parent | ce417a01c9a5cb0befc68533734d98023a03b96e (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/lldrawpooltree.cpp')
| -rw-r--r-- | indra/newview/lldrawpooltree.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 83f04e45a8..fedbd782dc 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -116,6 +116,7 @@ void LLDrawPoolTree::render(S32 pass) gGL.loadMatrix(gGLModelView); if (model_matrix) { + llassert(gGL.getMatrixMode() == LLRender::MM_MODELVIEW); gGL.multMatrix((GLfloat*) model_matrix->mMatrix); } gPipeline.mMatrixOpCount++; |