Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-10-30 12:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2018-07-09 16:24:01 +02:00
parent 6277781e83 0708f91617
commit 14cef31467
11 changed files with 181 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/imgui_impl_opengl3.cpp
View File

@@ -33,8 +33,11 @@
#include "imgui.h"
#include "imgui_impl_opengl3.h"
#include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions. You may freely use any other OpenGL loader such as: glew, glad, glLoadGen, etc.
#include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions. You may use another OpenGL loader/header such as: glew, glext, glad, glLoadGen, etc.
//#include <glew.h>
//#include <glext.h>
//#include <glad/glad.h>
// OpenGL Data
static char g_GlslVersion[32] = "";