[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25781] trunk/blender: Disable OpenGL anti-aliasing by default for now.

[Damien Plisson]

Revision: 25781
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25781
Author:   damien78
Date:     2010-01-06 16:34:49 +0100 (Wed, 06 Jan 2010)

Log Message:
-----------
Disable OpenGL anti-aliasing by default for now.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-01-06 15:19:51 UTC (rev 25780)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-01-06 15:34:49 UTC (rev 25781)
@@ -877,6 +877,9 @@
 		if (m_openGLContext != nil) {
 			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 			[m_openGLContext makeCurrentContext];
+			
+			// Disable AA by default
+			if (m_numOfAASamples > 0) glDisable(GL_MULTISAMPLE_ARB);
 			[pool drain];
 			return GHOST_kSuccess;
 		}

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2010-01-06 15:19:51 UTC (rev 25780)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2010-01-06 15:34:49 UTC (rev 25781)
@@ -313,7 +313,7 @@
 								 inital_state, 
 								 GHOST_kDrawingContextTypeOpenGL,
 								 0 /* no stereo */,
-								 4 /* 4x AA */);
+								 0 /* no AA */);
 	
 	if (ghostwin) {