aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2018-03-25 11:29:28 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2018-03-25 11:29:28 +0200
commit0f2e553819d27694d199b487e5742b2db9396c86 (patch)
treedc9a3dc7e15dcb039a9fd08735f9971ba700580a
parent709f26b0ef1ff56e8a0ac71d463ad42da7bc6eb3 (diff)
parentccc60b96c16ed88b4f22e0a62a56d8aaa8a0d944 (diff)
downloadsherlock.lv2-0f2e553819d27694d199b487e5742b2db9396c86.tar.xz
Merge commit 'ccc60b96c16ed88b4f22e0a62a56d8aaa8a0d944'
-rw-r--r--nuklear/Readme.md4
-rw-r--r--nuklear/demo/x11_opengl2/main.c4
-rw-r--r--nuklear/nuklear.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/nuklear/Readme.md b/nuklear/Readme.md
index 43f9d3d..d097e35 100644
--- a/nuklear/Readme.md
+++ b/nuklear/Readme.md
@@ -102,7 +102,9 @@ languages. Furthermore there are no guarantee that all bindings will always be k
- [Chicken](https://github.com/wasamasa/nuklear) by wasamasa@github.com
- [Nim](https://github.com/zacharycarter/nuklear-nim) by zacharycarter@github.com
- [Lua/Löve2d](https://github.com/keharriso/love-nuklear) by Kevin Harrison
-- [Python](https://github.com/billsix/pyNuklear) by William Emerison Six
+- Python
+ - [pyNuklear](https://github.com/billsix/pyNuklear) by William Emerison Six (ctypes-based wrapper)
+ - [pynk](https://github.com/nathanrw/nuklear-cffi) by nathanrw@github.com (cffi binding)
- [CSharp/.NET](https://github.com/cartman300/NuklearDotNet) by cartman300@github.com
## Credits
diff --git a/nuklear/demo/x11_opengl2/main.c b/nuklear/demo/x11_opengl2/main.c
index 047fcf3..12cbed1 100644
--- a/nuklear/demo/x11_opengl2/main.c
+++ b/nuklear/demo/x11_opengl2/main.c
@@ -211,8 +211,8 @@ int main(void)
glContext = glXCreateNewContext(win.dpy, win.fbc, GLX_RGBA_TYPE, 0, True);
} else {
GLint attr[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
- GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+ GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
+ GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
glContext = create_context(win.dpy, win.fbc, 0, True, attr);
diff --git a/nuklear/nuklear.h b/nuklear/nuklear.h
index 8e103e3..dd423b9 100644
--- a/nuklear/nuklear.h
+++ b/nuklear/nuklear.h
@@ -19097,7 +19097,7 @@ nk_build(struct nk_context *ctx)
cmd = nk_ptr_add(struct nk_command, buffer, it->buffer.last);
while (next && ((next->buffer.last == next->buffer.begin) ||
- (next->flags & NK_WINDOW_HIDDEN)))
+ (next->flags & NK_WINDOW_HIDDEN) || next->seq != ctx->seq))
next = next->next; /* skip empty command buffers */
if (next) cmd->next = next->buffer.begin;