Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease

2016-03-14 00:59:32 +01:00
parent 1345889e62 50abeda99a
commit 3994c0f7ad
24 changed files with 6754 additions and 4245 deletions
@@ -414,7 +414,6 @@ void DrawFinalPass::ClearBuffer()
    GLERROR("END");
 }

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