mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-30 03:10:06 +00:00
Code Activity

Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4)

Browse source 
Amend b5cad20d79, 945a509773
+ unrelated minor typos
This commit is contained in:
omar 2019-12-05 15:43:05 +01:00
parent 945a509773
commit 8342e5b91a
10 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_draw.cpp
View file

@ -1673,7 +1673,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels,
void* data = ImFileLoadToMemory(filename, "rb", &data_size, 0);
if (!data)
{
IM_ASSERT_USER_ERROR(0, "Could not font load file.");
IM_ASSERT_USER_ERROR(0, "Could not load font file!");
return NULL;
}
ImFontConfig font_cfg = font_cfg_template ? *font_cfg_template : ImFontConfig();