diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
| commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
| tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /intern/ghost/intern/GHOST_SystemX11.h | |
| parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
| parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) | |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemX11.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index ad58138d416..a852675acfb 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -153,7 +153,7 @@ class GHOST_SystemX11 : public GHOST_System { * Never explicitly delete the context, use disposeContext() instead. * \return The new context (or 0 if creation failed). */ - GHOST_IContext *createOffscreenContext(); + GHOST_IContext *createOffscreenContext(GHOST_GLSettings glSettings); /** * Dispose of a context. |