archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Partial fix T41749

Browse Source 
2d & 3d cached text now draws pixel aligned now.
This commit is contained in:
Campbell Barton
2014-09-10 15:01:39 +10:00
parent ad0790f14e
commit 384220eeab
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/view2d.c
View File

@@ -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;

3
source/blender/editors/space_view3d/drawobject.c
View File

@@ -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);