Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 13:08:47 +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-09-06 15:59:35 +02:00
parent a2616c79fe e0cab5664a
commit b974fffea0
11 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_draw.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.65 WIP
// dear imgui, v1.65
// (drawing and font code)
/*
@ -119,7 +119,7 @@ namespace IMGUI_STB_NAMESPACE
#ifdef IMGUI_STB_RECT_PACK_FILENAME
#include IMGUI_STB_RECT_PACK_FILENAME
#else
#include "stb_rect_pack.h"
#include "imstb_rectpack.h"
#endif
#endif
@ -142,7 +142,7 @@ namespace IMGUI_STB_NAMESPACE
#ifdef IMGUI_STB_TRUETYPE_FILENAME
#include IMGUI_STB_TRUETYPE_FILENAME
#else
#include "stb_truetype.h"
#include "imstb_truetype.h"
#endif
#endif