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 | |
| 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.
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemNULL.h | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowNULL.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
4 files changed, 7 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; diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 52710a62855..8009cafadea 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -76,12 +76,14 @@ #include "interface_intern.h" +#ifndef WITH_HEADLESS #define ICON_GRID_COLS 26 #define ICON_GRID_ROWS 30 #define ICON_GRID_MARGIN 10 #define ICON_GRID_W 32 #define ICON_GRID_H 32 +#endif /* WITH_HEADLESS */ typedef struct IconImage { int w; diff --git a/source/creator/creator.c b/source/creator/creator.c index 1fec281a71c..cea32a8b171 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -195,6 +195,7 @@ static void fpe_handler(int UNUSED(sig)) #endif /* handling ctrl-c event in console */ +#if !(defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)) static void blender_esc(int sig) { static int count = 0; @@ -210,6 +211,7 @@ static void blender_esc(int sig) count++; } } +#endif static int print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) { |