diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-16 11:36:01 +0300 |
commit | c2fbe46b0f0fde44b8a40d89601a195da27d28fb (patch) | |
tree | f66e3e50758acb36001e2774c6e4ede5fc8bead6 /intern/ghost/intern/GHOST_SystemNULL.h | |
parent | 386ba094988fc793f8e060d15438566e5e2d2cae (diff) | |
parent | dcf57e34f3866bba5ddd9cfdfe858a1a5eedc4c2 (diff) |
Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemNULL.h')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemNULL.h | 5 |
1 files changed, 3 insertions, 2 deletions
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, |