mirror of
https://github.com/Drezil/imgui.git
synced 2025-07-06 13:08:47 +02:00
Merge branch 'master' into viewport
# Conflicts: # imgui.cpp
This commit is contained in:
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user