[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20290] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 20290
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20290
Author:   ton
Date:     2009-05-20 13:07:34 +0200 (Wed, 20 May 2009)

Log Message:
-----------
2.5

Fix: Node Editor backdrop drawing messed up viewport, making drawing of
UI elements not pixel accurate anymore.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/glutil.c
    branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/glutil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/glutil.c  
2009-05-20 10:31:11 UTC (rev 20289)
+++ branches/blender2.5/blender/source/blender/editors/screen/glutil.c  
2009-05-20 11:07:34 UTC (rev 20290)
@@ -591,8 +591,8 @@
 
 void glaDefine2DArea(rcti *screen_rect)
 {
-       int sc_w= screen_rect->xmax - screen_rect->xmin;
-       int sc_h= screen_rect->ymax - screen_rect->ymin;
+       int sc_w= screen_rect->xmax - screen_rect->xmin + 1;
+       int sc_h= screen_rect->ymax - screen_rect->ymin + 1;
 
        glViewport(screen_rect->xmin, screen_rect->ymin, sc_w, sc_h);
        glScissor(screen_rect->xmin, screen_rect->ymin, sc_w, sc_h);

Modified: 
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c    
2009-05-20 10:31:11 UTC (rev 20289)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c    
2009-05-20 11:07:34 UTC (rev 20290)
@@ -2440,6 +2440,9 @@
                ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
                if(ibuf) {
                        float x, y; 
+                       
+                       wmPushMatrix();
+                       
                        /* somehow the offset has to be calculated inverse */
                        
                        glaDefine2DArea(&ar->winrct);
@@ -2454,9 +2457,7 @@
                        else if(ibuf->channels==4)
                                glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, 
ibuf->x, GL_RGBA, GL_FLOAT, ibuf->rect_float);
                        
-                       /* sort this out, this should not be needed */
-                       wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, 
ar->v2d.cur.ymin, ar->v2d.cur.ymax);
-                       glLoadIdentity();
+                       wmPopMatrix();
                }
        }
 }


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