[Bf-blender-cvs] [b3b4b9fb8c2] blender2.8: Fix WITH_HEADLESS build.

Brecht Van Lommel noreply at git.blender.org
Fri Jul 20 15:28:49 CEST 2018


Commit: b3b4b9fb8c255d2ec7cc7433ffcafef6311da6e9
Author: Brecht Van Lommel
Date:   Fri Jul 20 15:12:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb3b4b9fb8c255d2ec7cc7433ffcafef6311da6e9

Fix WITH_HEADLESS build.

===================================================================

M	intern/ghost/intern/GHOST_SystemNULL.h
M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
index 7c8d26d7486..ac3dfd71d63 100644
--- a/intern/ghost/intern/GHOST_SystemNULL.h
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -53,6 +53,8 @@ public:
 	void getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const { /* nop */ }
 	void getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const { /* nop */ }
 	bool supportsNativeDialogs(void) { return false;}
+	GHOST_IContext *createOffscreenContext() { return NULL; }
+	GHOST_TSuccess disposeContext(GHOST_IContext *context) { return GHOST_kFailure; }
 
 	GHOST_TSuccess init() {
 		GHOST_TSuccess success = GHOST_System::init();
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index e2247b2adff..8b1cce27502 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -4569,7 +4569,11 @@ bool WM_window_modal_keymap_status_draw(
 					continue;
 				}
 				int icon_mod[4];
+#ifdef WITH_HEADLESS
+				int icon = 0;
+#else
 				int icon = UI_icon_from_keymap_item(kmi, icon_mod);
+#endif
 				if (icon != 0) {
 					for (int j = 0; j < ARRAY_SIZE(icon_mod) && icon_mod[j]; j++) {
 						uiItemL(row, "", icon_mod[j]);



More information about the Bf-blender-cvs mailing list