NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

There were a few conflicts/missing files. Hopefully everything updated ok...

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index c81ca909318..50283113b62 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -131,6 +131,7 @@ struct View2DScrollers;
 struct wmWindowManager;
 struct bScreen;
 struct ScrArea;
+struct ARegion;
 struct bContext;
 struct rctf;
 
@@ -183,6 +184,10 @@ void UI_view2d_getscale(struct View2D *v2d, float *x, float *y);
 
 short UI_view2d_mouse_in_scrollers(const struct bContext *C, struct View2D *v2d, int x, int y);
 
+/* cached text drawing in v2d, to allow pixel-aligned draw as post process */
+void UI_view2d_text_cache_add(struct View2D *v2d, float x, float y, char *str);
+void UI_view2d_text_cache_rectf(struct View2D *v2d, struct rctf *rect, char *str);
+void UI_view2d_text_cache_draw(struct ARegion *ar);
 
 /* operators */
 void ui_view2d_operatortypes(void);