diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 09:01:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-10 09:01:39 +0400 |
commit | 384220eeab68223edb65d6addd33cf1d9a27cf5e (patch) | |
tree | f2150691f688d0b7a42f4fde35c43bc001b7771f /source/blender/editors | |
parent | ad0790f14e06425bc0b47379e8ae432d6dbcf54f (diff) |
Partial fix T41749
2d & 3d cached text now draws pixel aligned now.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/view2d.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index ccc6f6de94e..d48faa34618 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -2355,12 +2355,8 @@ void UI_view2d_text_cache_draw(ARegion *ar) /* investigate using BLF_ascender() */ const float default_height = g_v2d_strings ? BLF_height_default("28", 3) : 0.0f; - - // glMatrixMode(GL_PROJECTION); - // glPushMatrix(); - // glMatrixMode(GL_MODELVIEW); - // glPushMatrix(); - ED_region_pixelspace(ar); + + wmOrtho2_region_ui(ar); for (v2s = g_v2d_strings; v2s; v2s = v2s->next) { int xofs = 0, yofs; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 75d64e93d59..e7b6e50ef1c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -880,7 +880,8 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write, flo glPushMatrix(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); - ED_region_pixelspace(ar); + wmOrtho2_region_ui(ar); + glLoadIdentity(); if (depth_write) { if (v3d->zbuf) glDisable(GL_DEPTH_TEST); |