[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55740] trunk/blender/intern/ghost/intern: Fix incorrect OS X warning message in console when using multisample antialiasing

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Apr 2 21:18:38 CEST 2013


Revision: 55740
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55740
Author:   blendix
Date:     2013-04-02 19:18:38 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix incorrect OS X warning message in console when using multisample antialiasing
about number of samples not matching the requested number.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
    trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
    trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-04-02 18:19:37 UTC (rev 55739)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-04-02 19:18:38 UTC (rev 55740)
@@ -454,7 +454,7 @@
 	GHOST_TDrawingContextType type,
 	const bool stereoVisual, const GHOST_TUns16 numOfAASamples
 ) :
-	GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, numOfAASamples),
+	GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, false, numOfAASamples),
 	m_customCursor(0)
 {
 	NSOpenGLPixelFormatAttribute pixelFormatAttrsWindow[40];

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h	2013-04-02 18:19:37 UTC (rev 55739)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h	2013-04-02 19:18:38 UTC (rev 55740)
@@ -53,7 +53,7 @@
 	    const bool stereoVisual,
 	    const GHOST_TUns16 numOfAASamples
 	    ) :
-		GHOST_Window(width, height, state, type, stereoVisual, numOfAASamples),
+		GHOST_Window(width, height, state, type, stereoVisual, false, numOfAASamples),
 		m_system(system)
 	{
 		setTitle(title);

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-04-02 18:19:37 UTC (rev 55739)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-04-02 19:18:38 UTC (rev 55740)
@@ -130,7 +130,7 @@
     int msPixelFormat)
 	:
 	GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone,
-	             stereoVisual, numOfAASamples),
+	             stereoVisual, false, numOfAASamples),
 	m_system(system),
 	m_hDC(0),
 	m_hGlRc(0),




More information about the Bf-blender-cvs mailing list