Merge branch 'master' into docking

# Conflicts: # imgui.cpp
2025-09-25 12:48:29 +00:00 · 2023-05-22 10:10:29 +02:00
parent e590b5114e 45c8c3b611
commit 54c1ac3e38
9 changed files with 124 additions and 107 deletions
--- a/examples/example_win32_directx9/main.cpp
+++ b/examples/example_win32_directx9/main.cpp
@@ -111,6 +111,7 @@ int main(int, char**)
        {
            g_d3dpp.BackBufferWidth = g_ResizeWidth;
            g_d3dpp.BackBufferHeight = g_ResizeHeight;
+            g_ResizeWidth = g_ResizeHeight = 0;
            ResetDevice();
        }