Merge branch 'master' into DashEffect

2016-03-14 00:07:45 +01:00
parent 12d0c68fbf b89f68ae2f
commit ef9a449077
2 changed files with 103 additions and 50 deletions
@@ -414,7 +414,6 @@ void DrawFinalPass::ClearBuffer()
    GLERROR("END");
 }

-
 void DrawFinalPass::OnWindowResize()
 {
 	if (m_FinalPassFrameBuffer->MultiSampling() != (bool)m_MSAA) {