[Bf-blender-cvs] [f680ab9c4e2] master: Fix strips text offset when zooming VSE timeline
Richard Antalik
noreply at git.blender.org
Sat Feb 23 21:00:20 CET 2019
Commit: f680ab9c4e2ee467017405d6a32d770c576a6f69
Author: Richard Antalik
Date: Sat Feb 23 11:37:24 2019 -0800
Branches: master
https://developer.blender.org/rBf680ab9c4e2ee467017405d6a32d770c576a6f69
Fix strips text offset when zooming VSE timeline
Glyph cache is cleared by UI_view2d_zoom_cache_reset, when zooming V2D, but is required to calculate text height in UI_view2d_text_cache_draw
This caused text in strips to "jump around"
There was a comment in UI_view2d_zoom_cache_reset:
While scaling we can accumulate fonts at many sizes (~20 or so).
Not an issue with embedded font, but can use over 500Mb with i18n ones! See [#38244].
===================================================================
M source/blender/editors/interface/view2d.c
===================================================================
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 6ac8d83da92..bb49f024bc3 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -2572,6 +2572,8 @@ void UI_view2d_text_cache_draw(ARegion *ar)
/* investigate using BLF_ascender() */
const int font_id = BLF_default();
+
+ BLF_set_default();
const float default_height = g_v2d_strings ? BLF_height(font_id, "28", 3) : 0.0f;
wmOrtho2_region_pixelspace(ar);
More information about the Bf-blender-cvs
mailing list