mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-21 23:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/example_apple_opengl2/main.mm
This commit is contained in:
ocornut
2026-08-19 13:32:49 +02:00
parent 83f668625a 1d7b37dc9b
commit fd13a1e892
19 changed files with 698 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_glfw_wgpu/main.cpp
View File

@@ -549,7 +549,7 @@ WGPUSurface CreateWGPUSurface(const WGPUInstance& instance, GLFWwindow* window)
{
create_info.System = "win32";
create_info.RawWindow = (void*)glfwGetWin32Window(window);
create_info.RawInstance = (void*)::GetModuleHandle(NULL);
create_info.RawInstance = (void*)::GetModuleHandle(nullptr);
return ImGui_ImplWGPU_CreateWGPUSurfaceHelper(&create_info);
}
#else