Correction for recent commit clearing font cache

- move cache reset into view2d and comment about the rationale for resetting cache there.
- missed other places where view2d zoom level can change (smoothview, borderzoom, home and file reload)
- comment about DPI wasn't correct.

2 files changed, 18 insertions, 9 deletions

diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 544d9a0f575..aadb1b30f5b 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -985,6 +985,15 @@ bool UI_view2d_tab_set(View2D *v2d, int tab)
 	return changed;
 }
 
+void UI_view2d_zoom_cache_reset(void)
+{
+	/* 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]. */
+
+	/* note: only some views draw text, we could check for this case to avoid clearning cache */
+	BLF_cache_clear();
+}
+
 /* *********************************************************************** */
 /* View Matrix Setup */
 
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c
index d299b72b881..dfd6a9fb48f 100644
--- a/source/blender/editors/interface/view2d_ops.c
+++ b/source/blender/editors/interface/view2d_ops.c
@@ -38,8 +38,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_math_base.h"
 
-#include "BLF_api.h"
-
 #include "BKE_context.h"
 
 #include "RNA_access.h"
@@ -664,9 +662,7 @@ static void view_zoomstep_apply(bContext *C, wmOperator *op)
 /* cleanup temp customdata  */
 static void view_zoomstep_exit(wmOperator *op)
 {
-	/* Fonts are stored at each DPI level, without this we can easy load 100's of fonts.
-	 * Not an issue with embedded font, but can use over 500Mo with i18n ones! See T38244. */
-	BLF_cache_clear();
+	UI_view2d_zoom_cache_reset();
 
 	if (op->customdata) {
 		MEM_freeN(op->customdata);
@@ -899,9 +895,7 @@ static void view_zoomdrag_apply(bContext *C, wmOperator *op)
 /* cleanup temp customdata  */
 static void view_zoomdrag_exit(bContext *C, wmOperator *op)
 {
-	/* Fonts are stored at each DPI level, without this we can easy load 100's of fonts.
-	 * Not an issue with embedded font, but can use over 500Mo with i18n ones! See T38244. */
-	BLF_cache_clear();
+	UI_view2d_zoom_cache_reset();
 
 	if (op->customdata) {
 		v2dViewZoomData *vzd = op->customdata;
@@ -1373,6 +1367,10 @@ static int view2d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const w
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 	ED_region_tag_redraw(ar);
 
+	if (v2d->sms == NULL) {
+		UI_view2d_zoom_cache_reset();
+	}
+
 	return OPERATOR_FINISHED;
 }
 
@@ -1865,9 +1863,11 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 	ED_region_tag_redraw(ar);
 	UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 	
+	UI_view2d_zoom_cache_reset();
+
 	return OPERATOR_FINISHED;
 }
- 
+
 static void VIEW2D_OT_reset(wmOperatorType *ot)
 {
 	/* identifiers */