Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 20:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2020-10-08 16:03:16 +02:00
parent 958e58b06b e5cb04b132
commit 682249396f
16 changed files with 192 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/README.txt
View File

@ -1,5 +1,5 @@
-----------------------------------------------------------------------
dear imgui, v1.79 WIP
dear imgui, v1.79
-----------------------------------------------------------------------
examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation)

2
examples/example_glfw_opengl3/main.cpp
View File

@ -56,7 +56,7 @@ int main(int, char**)
return 1;
// Decide GL+GLSL versions
#if __APPLE__
#ifdef __APPLE__
// GL 3.2 + GLSL 150
const char* glsl_version = "#version 150";
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);

2
examples/example_sdl_opengl3/main.cpp
View File

@ -48,7 +48,7 @@ int main(int, char**)
}
// Decide GL+GLSL versions
#if __APPLE__
#ifdef __APPLE__
// GL 3.2 Core + GLSL 150
const char* glsl_version = "#version 150";
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG); // Always required on Mac