Merge pull request #538 from metiscus/master

Improvement to SFML GL2 demo code
This commit is contained in:
Micha Mettke 2017-10-18 11:03:16 +02:00 committed by GitHub
commit 76a17910ff

View File

@ -81,6 +81,9 @@ nk_sfml_render(enum nk_anti_aliasing AA)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glViewport(0, 0, (GLsizei)window_width, (GLsizei)window_height);
glMatrixMode(GL_TEXTURE);
glPushMatrix();
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
@ -165,6 +168,8 @@ nk_sfml_render(enum nk_anti_aliasing AA)
glDisable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 0);
glMatrixMode(GL_TEXTURE);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
glMatrixMode(GL_PROJECTION);