Merge branch 'master' into docking

2025-09-18 09:03:13 +02:00 · 2019-02-12 10:30:48 +01:00
parent 7f6a025c93 cc80d8e118
commit 8691b56136
4 changed files with 9 additions and 4 deletions
--- a/examples/imgui_impl_opengl2.cpp
+++ b/examples/imgui_impl_opengl2.cpp
@ -46,6 +46,7 @@
 #define WINGDIAPI __declspec(dllimport)     // Some Windows OpenGL headers need this
 #endif
 #if defined(__APPLE__)
+#define GL_SILENCE_DEPRECATION
 #include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>