Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-16 17:53:14 +02: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-06-26 12:41:36 +02:00
parent d3ee3e7ab5 79153cf19f
commit c38fe6b0e1
10 changed files with 89 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_opengl3.cpp
View File

@ -33,7 +33,7 @@
//#include <glew.h>
// OpenGL Data
static char g_GlslVersion[32] = "#version 150";
static char g_GlslVersion[32] = "";
static GLuint g_FontTexture = 0;
static int g_ShaderHandle = 0, g_VertHandle = 0, g_FragHandle = 0;
static int g_AttribLocationTex = 0, g_AttribLocationProjMtx = 0;