|
@@ -1143,6 +1143,10 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
|
|
IM_PLACEMENT_NEW(font) ImFont();
|
|
IM_PLACEMENT_NEW(font) ImFont();
|
|
Fonts.push_back(font);
|
|
Fonts.push_back(font);
|
|
}
|
|
}
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ IM_ASSERT(!Fonts.empty()); // When using MergeMode make sure that a font has already been added before. You can use ImGui::AddFontDefault() to add the default imgui font.
|
|
|
|
+ }
|
|
|
|
|
|
ConfigData.push_back(*font_cfg);
|
|
ConfigData.push_back(*font_cfg);
|
|
ImFontConfig& new_font_cfg = ConfigData.back();
|
|
ImFontConfig& new_font_cfg = ConfigData.back();
|