diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
| commit | a7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch) | |
| tree | 81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/newview/lldrawpool.cpp | |
| parent | df93749819c503a66bc0ad34aeb1c7bed3746df2 (diff) | |
| parent | b9e43dfd646990be236e44814ce3199de3391dc1 (diff) | |
merge up to latest viewer-development
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++; |