From a994a52497c3565ccc6102a5bf28f01ffe94b7f7 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Wed, 6 Jan 2010 15:34:49 +0000 Subject: [PATCH] Disable OpenGL anti-aliasing by default for now. --- intern/ghost/intern/GHOST_WindowCocoa.mm | 3 +++ source/blender/windowmanager/intern/wm_window.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 4d1aa35c4e7..66c6d75b6d7 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -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; } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 61e6063329a..0e1d7969daf 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -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) {