Merge branch 'master' into docking

# Conflicts: # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_win32.cpp
2025-12-22 14:19:04 +00:00 · 2022-09-29 22:02:23 +02:00
parent 11f5be0caf cc5058e5d7
commit d91211f9f2
17 changed files with 372 additions and 282 deletions
--- a/examples/example_glut_opengl2/main.cpp
+++ b/examples/example_glut_opengl2/main.cpp
@@ -17,6 +17,7 @@
 #include "imgui.h"
 #include "imgui_impl_glut.h"
 #include "imgui_impl_opengl2.h"
+#define GL_SILENCE_DEPRECATION
 #ifdef __APPLE__
    #include <GLUT/glut.h>
 #else