Merge branch 'master' into docking

# Conflicts: # backends/imgui_impl_vulkan.cpp
2025-09-06 19:38:28 +00:00 · 2025-01-06 17:59:22 +01:00
parent eb642a9535 93a93071a2
commit 9cc0bf89bd
26 changed files with 964 additions and 161 deletions
--- a/examples/example_sdl2_opengl3/main.cpp
+++ b/examples/example_sdl2_opengl3/main.cpp
@@ -87,7 +87,7 @@ int main(int, char**)
        printf("Error: SDL_GL_CreateContext(): %s\n", SDL_GetError());
        return -1;
    }
-    
+
    SDL_GL_MakeCurrent(window, gl_context);
    SDL_GL_SetSwapInterval(1); // Enable vsync