sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#34900] Building blender as a python module is broken in trunk

Browse Source 
patch provided by reporter - Martijn Berger (juicyfruit)

also quiet warnings for headless mode.
This commit is contained in:
Campbell Barton 2013-04-08 05:01:35 +00:00
parent b14f68521e
commit a4520320ef
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/ghost/intern/GHOST_SystemNULL.h
View File

@ -76,6 +76,7 @@ public:
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
bool stereoVisual,
bool exclusive,
const GHOST_TUns16 numOfAASamples,
const GHOST_TEmbedderWindowID parentWindow)
{

2
intern/ghost/intern/GHOST_WindowNULL.h
View File

@ -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;

2
source/blender/editors/interface/interface_icons.c
View File

@ -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;

2
source/creator/creator.c
View File

@ -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))
{