[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58920] trunk/blender/source/blender/ editors: minor glitch with border drawing, use glRecti rather then glRectf, so rounding matches the border render

[Campbell Barton]

Revision: 58920
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58920
Author:   campbellbarton
Date:     2013-08-05 04:35:28 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
minor glitch with border drawing, use glRecti rather then glRectf, so rounding 
matches the border render

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/area.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c  2013-08-05 04:25:17 UTC 
(rev 58919)
+++ trunk/blender/source/blender/editors/screen/area.c  2013-08-05 04:35:28 UTC 
(rev 58920)
@@ -401,21 +401,29 @@
        wmWindow *win = CTX_wm_window(C);
        ScrArea *sa = CTX_wm_area(C);
        ARegionType *at = ar->type;
+       rcti srct;
        
        /* see BKE_spacedata_draw_locks() */
        if (at->do_lock)
                return;
        
        /* if no partial draw rect set, full rect */
-       if (ar->drawrct.xmin == ar->drawrct.xmax)
+       if (ar->drawrct.xmin == ar->drawrct.xmax) {
                ar->drawrct = ar->winrct;
+               srct = ar->drawrct;
+       }
        else {
                /* extra clip for safety */
                BLI_rcti_isect(&ar->winrct, &ar->drawrct, &ar->drawrct);
+               srct = ar->drawrct;
+
+               /* compensate for wmSubWindowScissorSet which adds one */
+               srct.xmax -= 1;
+               srct.ymax -= 1;
        }
        
        /* note; this sets state, so we can use wmOrtho and friends */
-       wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct);
+       wmSubWindowScissorSet(win, ar->swinid, &srct);
        
        UI_SetTheme(sa ? sa->spacetype : 0, at->regionid);
        

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-08-05 04:25:17 UTC (rev 58919)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-08-05 04:35:28 UTC (rev 58920)
@@ -1189,7 +1189,7 @@
                y4 = y1 + scene->r.border.ymax * (y2 - y1);
                
                cpack(0x4040FF);
-               glRectf(x3,  y3,  x4,  y4); 
+               glRecti(x3,  y3,  x4,  y4);
        }
 
        /* safety border */
@@ -3420,7 +3420,7 @@
                setlinestyle(3);
                cpack(0x4040FF);
 
-               glRectf(v3d->render_border.xmin * ar->winx, 
v3d->render_border.ymin * ar->winy,
+               glRecti(v3d->render_border.xmin * ar->winx, 
v3d->render_border.ymin * ar->winy,
                        v3d->render_border.xmax * ar->winx, 
v3d->render_border.ymax * ar->winy);
 
                setlinestyle(0);

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