diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
| commit | c3eb22e2ab0f4f96d64d1de7969966efd5d45066 (patch) | |
| tree | d0472fa9bc46c4ed73fdd8c55e0e4a2616c3178f /source/blender/editors/interface/view2d.c | |
| parent | 7003c8a143dea49a4e4ccc6b26283933d87f4a87 (diff) | |
| parent | 88e69806b977a6ec97c807f5e97db3bf68cff759 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index a94ef0d1d5b..d31f2dec145 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1027,6 +1027,13 @@ bool UI_view2d_tab_set(View2D *v2d, int tab) void UI_view2d_zoom_cache_reset(void) { + /* TODO(sergey): This way we avoid threading conflict with VSE rendering + * text strip. But ideally we want to make glyph cache to be fully safe + * for threading. + */ + if (G.is_rendering) { + return; + } /* 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]. */ |