[Bf-blender-cvs] [7c2affd350b] master: Fix: Headless build
Ray Molenkamp
noreply at git.blender.org
Fri Oct 4 21:23:33 CEST 2019
Commit: 7c2affd350b6f4a4fb6a6a20632762186fc1867e
Author: Ray Molenkamp
Date: Fri Oct 4 13:23:26 2019 -0600
Branches: master
https://developer.blender.org/rB7c2affd350b6f4a4fb6a6a20632762186fc1867e
Fix: Headless build
===================================================================
M intern/ghost/intern/GHOST_SystemNULL.h
M intern/ghost/intern/GHOST_WindowNULL.h
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
index 93aea87e9a6..10138bfc6eb 100644
--- a/intern/ghost/intern/GHOST_SystemNULL.h
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -114,8 +114,9 @@ class GHOST_SystemNULL : public GHOST_System {
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
GHOST_GLSettings glSettings,
- bool exclusive,
- const GHOST_TEmbedderWindowID parentWindow)
+ const bool exclusive,
+ const bool is_dialog,
+ const GHOST_IWindow *parentWindow)
{
return new GHOST_WindowNULL(this,
title,
diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h
index 1d332a7dc3e..29f3eee7cce 100644
--- a/intern/ghost/intern/GHOST_WindowNULL.h
+++ b/intern/ghost/intern/GHOST_WindowNULL.h
@@ -36,6 +36,11 @@ class GHOST_WindowNULL : public GHOST_Window {
return NULL;
}
+ GHOST_TSuccess hasCursorShape(GHOST_TStandardCursor)
+ {
+ return GHOST_kSuccess;
+ }
+
GHOST_WindowNULL(GHOST_SystemNULL *system,
const STR_String &title,
GHOST_TInt32 left,
@@ -43,7 +48,7 @@ class GHOST_WindowNULL : public GHOST_Window {
GHOST_TUns32 width,
GHOST_TUns32 height,
GHOST_TWindowState state,
- const GHOST_TEmbedderWindowID parentWindow,
+ const GHOST_IWindow *parentWindow,
GHOST_TDrawingContextType type,
const bool stereoVisual)
: GHOST_Window(width, height, state, stereoVisual, false), m_system(system)
More information about the Bf-blender-cvs
mailing list