reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)

svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2010-05-29 21:31:57 +00:00
parent 9d3157eed0
commit c6bec43330
29 changed files with 251 additions and 383 deletions
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -297,7 +297,6 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
 	m_last_frontface = true;

 	glShadeModel(GL_SMOOTH);
-	glEnable(GL_MULTISAMPLE_ARB);

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

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