From 0fca7e2045d8f4a7c469b6fa87414cfec78cd927 Mon Sep 17 00:00:00 2001 From: Michael Bosse Date: Tue, 17 Oct 2017 17:16:55 -0400 Subject: [PATCH] Adds protection of the texture matrix stack which allows the user to use sf::Sprites with this code unmodified otherwise --- demo/sfml_opengl2/nuklear_sfml_gl2.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h index a4a2013..9649ec0 100644 --- a/demo/sfml_opengl2/nuklear_sfml_gl2.h +++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h @@ -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);