Merge branch 'master' into navigation

2017-10-23 10:05:36 +02:00
parent 5fa81f2a26 50f5be9266
commit d769e2515a
12 changed files with 153 additions and 85 deletions
@@ -1548,7 +1548,7 @@ struct ImFont
    // Methods
    IMGUI_API ImFont();
    IMGUI_API ~ImFont();
-    IMGUI_API void              Clear();
+    IMGUI_API void              ClearOutputData();
    IMGUI_API void              BuildLookupTable();
    IMGUI_API const ImFontGlyph*FindGlyph(ImWchar c) const;
    IMGUI_API void              SetFallbackChar(ImWchar c);