[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55895] trunk/blender: fix [#34900] Building blender as a python module is broken in trunk

Campbell Barton ideasman42 at gmail.com
Mon Apr 8 07:01:37 CEST 2013


Revision: 55895
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55895
Author:   campbellbarton
Date:     2013-04-08 05:01:35 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemNULL.h
    trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
    trunk/blender/source/blender/editors/interface/interface_icons.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemNULL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemNULL.h	2013-04-08 04:54:57 UTC (rev 55894)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemNULL.h	2013-04-08 05:01:35 UTC (rev 55895)
@@ -76,6 +76,7 @@
 			GHOST_TWindowState state,
 			GHOST_TDrawingContextType type,
 			bool stereoVisual,
+			bool exclusive,
 			const GHOST_TUns16 numOfAASamples,
 			const GHOST_TEmbedderWindowID parentWindow)
 	{

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h	2013-04-08 04:54:57 UTC (rev 55894)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h	2013-04-08 05:01:35 UTC (rev 55895)
@@ -86,6 +86,8 @@
 	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;

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2013-04-08 04:54:57 UTC (rev 55894)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2013-04-08 05:01:35 UTC (rev 55895)
@@ -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;

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2013-04-08 04:54:57 UTC (rev 55894)
+++ trunk/blender/source/creator/creator.c	2013-04-08 05:01:35 UTC (rev 55895)
@@ -195,6 +195,7 @@
 #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 @@
 		count++;
 	}
 }
+#endif
 
 static int print_version(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {




More information about the Bf-blender-cvs mailing list