diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 09:01:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 09:01:35 +0400 |
commit | a4520320ef70fc7e7cae8399e086fd8337f971a8 (patch) | |
tree | acb71d7f554f08e5990e760902b8bcfdd6f1e5fc /intern/ghost | |
parent | b14f68521e9fbc7e72aeecdbc4f9c02d5db99e4b (diff) |
fix [#34900] Building blender as a python module is broken in trunk
patch provided by reporter - Martijn Berger (juicyfruit)
also quiet warnings for headless mode.
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemNULL.h | 1 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowNULL.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h index 7021dea36dd..77a741c2efb 100644 --- a/intern/ghost/intern/GHOST_SystemNULL.h +++ b/intern/ghost/intern/GHOST_SystemNULL.h @@ -76,6 +76,7 @@ public: GHOST_TWindowState state, GHOST_TDrawingContextType type, bool stereoVisual, + bool exclusive, const GHOST_TUns16 numOfAASamples, const GHOST_TEmbedderWindowID parentWindow) { diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h index f595fa7d794..c848d773bd6 100644 --- a/intern/ghost/intern/GHOST_WindowNULL.h +++ b/intern/ghost/intern/GHOST_WindowNULL.h @@ -86,6 +86,8 @@ protected: GHOST_TSuccess invalidate() { return GHOST_kSuccess; } GHOST_TSuccess setOrder(GHOST_TWindowOrder order) { return GHOST_kSuccess; } + GHOST_TSuccess beginFullScreen() const { return GHOST_kSuccess; } + GHOST_TSuccess endFullScreen() const { return GHOST_kSuccess; } private: GHOST_SystemNULL *m_system; |