From 08877dc7860ff5f1a564bb154e713bb579e58071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sat, 15 Apr 2017 18:33:36 -0700
Subject: [PATCH] Updated ImGui.

---
 3rdparty/ocornut-imgui/imgui_draw.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/3rdparty/ocornut-imgui/imgui_draw.cpp b/3rdparty/ocornut-imgui/imgui_draw.cpp
index 8d1de8cf9..5ecc633ef 100644
--- a/3rdparty/ocornut-imgui/imgui_draw.cpp
+++ b/3rdparty/ocornut-imgui/imgui_draw.cpp
@@ -1145,6 +1145,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();