mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-26 12:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_win32.cpp
This commit is contained in:
ocornut
2021-06-08 18:38:51 +02:00
parent 16abfa5eb6 b66529fe3e
commit a44d4da87c
29 changed files with 267 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backends/imgui_impl_opengl3.cpp
View File

@@ -254,7 +254,7 @@ bool ImGui_ImplOpenGL3_Init(const char* glsl_version)
for (GLint i = 0; i < num_extensions; i++)
{
const char* extension = (const char*)glGetStringi(GL_EXTENSIONS, i);
if (strcmp(extension, "GL_ARB_clip_control") == 0)
if (extension != NULL && strcmp(extension, "GL_ARB_clip_control") == 0)
g_HasClipOrigin = true;
}
#endif