[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58918] trunk/blender/source/blender/ editors: use api function for rect intersection

[Campbell Barton]

Revision: 58918
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58918
Author:   campbellbarton
Date:     2013-08-05 04:19:34 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
use api function for rect intersection

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 01:24:41 UTC 
(rev 58917)
+++ trunk/blender/source/blender/editors/screen/area.c  2013-08-05 04:19:34 UTC 
(rev 58918)
@@ -410,11 +410,8 @@
        if (ar->drawrct.xmin == ar->drawrct.xmax)
                ar->drawrct = ar->winrct;
        else {
-               /* extra clip for safety (intersect the rects, could use API 
func) */
-               ar->drawrct.xmin = max_ii(ar->winrct.xmin, ar->drawrct.xmin);
-               ar->drawrct.ymin = max_ii(ar->winrct.ymin, ar->drawrct.ymin);
-               ar->drawrct.xmax = min_ii(ar->winrct.xmax, ar->drawrct.xmax);
-               ar->drawrct.ymax = min_ii(ar->winrct.ymax, ar->drawrct.ymax);
+               /* extra clip for safety */
+               BLI_rcti_isect(&ar->winrct, &ar->drawrct, &ar->drawrct);
        }
        
        /* note; this sets state, so we can use wmOrtho and friends */

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-08-05 01:24:41 UTC (rev 58917)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2013-08-05 04:19:34 UTC (rev 58918)
@@ -2953,10 +2953,8 @@
                rect->ymax = v3d->render_border.ymax * ar->winy;
        }
 
-       rect->xmin = CLAMPIS(ar->winrct.xmin + rect->xmin, ar->winrct.xmin, 
ar->winrct.xmax);
-       rect->ymin = CLAMPIS(ar->winrct.ymin + rect->ymin, ar->winrct.ymin, 
ar->winrct.ymax);
-       rect->xmax = CLAMPIS(ar->winrct.xmin + rect->xmax, ar->winrct.xmin, 
ar->winrct.xmax);
-       rect->ymax = CLAMPIS(ar->winrct.ymin + rect->ymax, ar->winrct.ymin, 
ar->winrct.ymax);
+       BLI_rcti_translate(rect, ar->winrct.xmin, ar->winrct.ymin);
+       BLI_rcti_isect(&ar->winrct, rect, rect);
 
        return true;
 }

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