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

Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2017-08-20 18:22:34 +08:00
commit bc78535bbf
5 changed files with 198 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui_draw.cpp
View file

@ -1213,8 +1213,8 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
ConfigData.push_back(*font_cfg);
ImFontConfig& new_font_cfg = ConfigData.back();
if (!new_font_cfg.DstFont)
new_font_cfg.DstFont = Fonts.back();
if (!new_font_cfg.DstFont)
new_font_cfg.DstFont = Fonts.back();
if (!new_font_cfg.FontDataOwnedByAtlas)
{
new_font_cfg.FontData = ImGui::MemAlloc(new_font_cfg.FontDataSize);