MatrixMode sanity checks and adjustments to physics debug display (fixes a crash with that debug view, too)

2012-10-22 03:05:18 -05:00
parent ef27cc54dd
commit d2004e88f9
5 changed files with 10 additions and 0 deletions
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -422,6 +422,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++;