Reversing the last merge because I botched it.

2010-05-29 21:22:24 +00:00
parent e335321e88
commit 9d3157eed0
29 changed files with 381 additions and 249 deletions
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -297,6 +297,7 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
 	m_last_frontface = true;

 	glShadeModel(GL_SMOOTH);
+	glEnable(GL_MULTISAMPLE_ARB);

 	m_2DCanvas->BeginFrame();
 	
@@ -382,6 +383,7 @@ void RAS_OpenGLRasterizer::EndFrame()
 	FlushDebugLines();

 	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+	glDisable(GL_MULTISAMPLE_ARB);
 	m_2DCanvas->EndFrame();
 }