Disable OpenGL anti-aliasing by default for now.
authorDamien Plisson <damien.plisson@yahoo.fr>
Wed, 6 Jan 2010 15:34:49 +0000 (15:34 +0000)
committerDamien Plisson <damien.plisson@yahoo.fr>
Wed, 6 Jan 2010 15:34:49 +0000 (15:34 +0000)
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/windowmanager/intern/wm_window.c

index 4d1aa35c4e73d41e553d7ecd2546d9e88237111e..66c6d75b6d756e4bb5603fb937938f5b4e0e2b98 100644 (file)
@@ -877,6 +877,9 @@ GHOST_TSuccess GHOST_WindowCocoa::activateDrawingContext()
                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;
                }
index 61e6063329a649dde118b79cb414d1b48f15cdb4..0e1d7969daf404eb22b6d0abe7de5baa91db5745 100644 (file)
@@ -313,7 +313,7 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, char *title, wmWindow
                                                                 inital_state, 
                                                                 GHOST_kDrawingContextTypeOpenGL,
                                                                 0 /* no stereo */,
-                                                                4 /* 4x AA */);
+                                                                0 /* no AA */);
        
        if (ghostwin) {