diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-24 09:06:40 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-24 09:06:40 +0400 |
commit | 81eafc49e624b089190ff21bdd9d71c4b4a5c7da (patch) | |
tree | 89ea4967e3d87d7a159833c876171a6db4ba20dc /source/blender/editors/screen | |
parent | db250a48f615ed36b368412deedaa77f59366d61 (diff) |
use min_ii/max_ii over MIN2 MAX2
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 5 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 1cdeeb174f6..eb08ba7d92e 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -533,10 +533,7 @@ void ED_region_tag_redraw_partial(ARegion *ar, rcti *rct) } else if (ar->drawrct.xmin != ar->drawrct.xmax) { /* partial redraw already set, expand region */ - ar->drawrct.xmin = MIN2(ar->drawrct.xmin, rct->xmin); - ar->drawrct.ymin = MIN2(ar->drawrct.ymin, rct->ymin); - ar->drawrct.xmax = MAX2(ar->drawrct.xmax, rct->xmax); - ar->drawrct.ymax = MAX2(ar->drawrct.ymax, rct->ymax); + BLI_rcti_union(&ar->drawrct, rct); } } } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 711928251ed..cd8a7978fb6 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -969,18 +969,18 @@ static void area_move_set_limits(bScreen *sc, int dir, int *bigger, int *smaller /* if top or down edge selected, test height */ if (sa->v1->flag && sa->v4->flag) - *bigger = MIN2(*bigger, y1); + *bigger = min_ii(*bigger, y1); else if (sa->v2->flag && sa->v3->flag) - *smaller = MIN2(*smaller, y1); + *smaller = min_ii(*smaller, y1); } else { int x1 = sa->v4->vec.x - sa->v1->vec.x - AREAMINX; /* if left or right edge selected, test width */ if (sa->v1->flag && sa->v2->flag) - *bigger = MIN2(*bigger, x1); + *bigger = min_ii(*bigger, x1); else if (sa->v3->flag && sa->v4->flag) - *smaller = MIN2(*smaller, x1); + *smaller = min_ii(*smaller, x1); } } } |