Commits

BaoLinden  committed 1eb9525 Merge
  • Participants
  • Parent commits aef25ca, 806c10f

Comments (0)

Files changed (2)

File indra/llrender/llrender.cpp

 	flush();
 
 	{
-		llassert_always(mMatrixMode < NUM_MATRIX_MODES) ;
-
 		mMatrix[mMatrixMode][mMatIdx[mMatrixMode]].make_identity();
 		mMatHash[mMatrixMode]++;
 	}

File indra/newview/pipeline.cpp

 	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
 	
 	// Initialize lots of GL state to "safe" values
+	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 	gGL.matrixMode(LLRender::MM_TEXTURE);
 	gGL.loadIdentity();
 	gGL.matrixMode(LLRender::MM_MODELVIEW);