diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
| commit | f5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch) | |
| tree | de1746f9e607d05b535523a3179ece971edd61ba /indra/newview/lldrawpooltree.cpp | |
| parent | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Merge from 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++; |