Added assert/comment about using MergeMode (#1100)

8 years ago · 670775ac22
parent 15d7f20d4f
commit 670775ac22
1 changed files with 4 additions and 0 deletions
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@ -1143,6 +1143,10 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
        IM_PLACEMENT_NEW(font) ImFont();
        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);
    ImFontConfig& new_font_cfg = ConfigData.back();