浏览代码

Fixed ImGui font merge.

Branimir Karadžić 7 年之前
父节点
当前提交
f853f5868f
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      3rdparty/ocornut-imgui/imgui_draw.cpp

+ 2 - 2
3rdparty/ocornut-imgui/imgui_draw.cpp

@@ -1820,8 +1820,8 @@ bool    ImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
         ImFontConfig& cfg = atlas->ConfigData[input_i];
         ImFontConfig& cfg = atlas->ConfigData[input_i];
         ImFontTempBuildData& tmp = tmp_array[input_i];
         ImFontTempBuildData& tmp = tmp_array[input_i];
         ImFont* dst_font = cfg.DstFont; // We can have multiple input fonts writing into a same destination font (when using MergeMode=true)
         ImFont* dst_font = cfg.DstFont; // We can have multiple input fonts writing into a same destination font (when using MergeMode=true)
-        if (cfg.MergeMode)
-            dst_font->BuildLookupTable();
+//        if (cfg.MergeMode)
+//            dst_font->BuildLookupTable();
 
 
         const float font_scale = stbtt_ScaleForPixelHeight(&tmp.FontInfo, cfg.SizePixels);
         const float font_scale = stbtt_ScaleForPixelHeight(&tmp.FontInfo, cfg.SizePixels);
         int unscaled_ascent, unscaled_descent, unscaled_line_gap;
         int unscaled_ascent, unscaled_descent, unscaled_line_gap;