diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
| commit | c6bec43330be0874b4116d259bbaf9fb90ed0556 (patch) | |
| tree | a1de833c9b4067a0659461ce8af20857678034ed /intern | |
| parent | 9d3157eed000e7c543d04f5ad3efc5990675903b (diff) | |
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
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/GHOST_ISystem.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_System.cpp | 9 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_System.h | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index 6762af89d76..8d80c74e140 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -258,7 +258,7 @@ public: * @return Indication of success. */ virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0) = 0; + const bool stereoVisual) = 0; /** * Ends full screen mode. diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index b1b1241fbe7..c89534e01c5 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -133,7 +133,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window) GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples) + const bool stereoVisual) { GHOST_TSuccess success = GHOST_kFailure; GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager") @@ -145,7 +145,7 @@ GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting); if (success == GHOST_kSuccess) { //GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n"); - success = createFullScreenWindow((GHOST_Window**)window, stereoVisual, numOfAASamples); + success = createFullScreenWindow((GHOST_Window**)window, stereoVisual); if (success == GHOST_kSuccess) { m_windowManager->beginFullScreen(*window, stereoVisual); } @@ -327,7 +327,7 @@ GHOST_TSuccess GHOST_System::exit() } -GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples) +GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual) { GHOST_TSuccess success; GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager") @@ -341,8 +341,7 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const 0, 0, settings.xPixels, settings.yPixels, GHOST_kWindowStateFullScreen, GHOST_kDrawingContextTypeOpenGL, - stereoVisual, - numOfAASamples); + stereoVisual); success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess; } return success; diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 30a38564b47..d6c6a356323 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -141,7 +141,7 @@ public: * @return Indication of success. */ virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0); + const bool stereoVisual); /** * Ends full screen mode. @@ -330,7 +330,7 @@ protected: * @return Indication of success. */ virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window** window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0); + const bool stereoVisual); /** The display manager (platform dependant). */ GHOST_DisplayManager* m_displayManager; |