[Bf-blender-cvs] [a86482f] master: Fix T43158: pixels in the 3d-view was mis-aligned

[Campbell Barton]

Commit: a86482f81cf3e4a0043459b10242d4a9c337105b
Author: Campbell Barton
Date:   Wed Jan 21 23:01:50 2015 +1100
Branches: master
https://developer.blender.org/rBa86482f81cf3e4a0043459b10242d4a9c337105b

Fix T43158: pixels in the 3d-view was mis-aligned

Change the pixel offset for regions, it make oversampling blurry when drawing 
pixel aligned values.
See T41749

===================================================================

M       source/blender/editors/space_node/drawnode.c
M       source/blender/editors/space_text/text_draw.c
M       source/blender/windowmanager/intern/wm_subwindow.c

===================================================================

diff --git a/source/blender/editors/space_node/drawnode.c 
b/source/blender/editors/space_node/drawnode.c
index c45626e..870b463 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3053,9 +3053,7 @@ void draw_nodespace_back_pix(const bContext *C, ARegion 
*ar, SpaceNode *snode, b
                /* somehow the offset has to be calculated inverse */
                
                glaDefine2DArea(&ar->winrct);
-               /* ortho at pixel level curarea */
-               /* almost #wmOrtho2_region_pixelspace, but no +1 px */
-               wmOrtho2_pixelspace(ar->winx, ar->winy);
+               wmOrtho2_region_pixelspace(ar);
                
                x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof;
                y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof;
diff --git a/source/blender/editors/space_text/text_draw.c 
b/source/blender/editors/space_text/text_draw.c
index 31662c0..bc5c56c 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1447,7 +1447,6 @@ void draw_text_main(SpaceText *st, ARegion *ar)
 
        /* draw other stuff */
        draw_brackets(st, ar);
-       glTranslatef(GLA_PIXEL_OFS, GLA_PIXEL_OFS, 0.0f); /* XXX scroll 
requires exact pixel space */
        draw_textscroll(st, &scroll, &back);
        draw_documentation(st, ar);
        draw_suggestion_list(st, ar);
diff --git a/source/blender/windowmanager/intern/wm_subwindow.c 
b/source/blender/windowmanager/intern/wm_subwindow.c
index d2df020..4ce2415 100644
--- a/source/blender/windowmanager/intern/wm_subwindow.c
+++ b/source/blender/windowmanager/intern/wm_subwindow.c
@@ -367,7 +367,7 @@ static void wmOrtho2_offset(const float x, const float y, 
const float ofs)
  */
 void wmOrtho2_region_pixelspace(const struct ARegion *ar)
 {
-       wmOrtho2_offset(ar->winx + 1, ar->winy + 1, -GLA_PIXEL_OFS);
+       wmOrtho2_offset(ar->winx, ar->winy, -0.01f);
 }
 
 void wmOrtho2_pixelspace(const float x, const float y)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs