diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 20:21:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 20:21:55 +0400 |
| commit | fec81d9b56075f46f6dde196ac85140872cff74e (patch) | |
| tree | 6ee12fcc0b04ba3041f1b7e4d17281136375beb1 /source/blender/editors/mask | |
| parent | c623ba5e4b2aa68a5717ba17500c14217bc417aa (diff) | |
use min_ max_ functions in more places.
also fix minor error in MOD decimate when the modifier did nothing the reported face count would be wrong.
Diffstat (limited to 'source/blender/editors/mask')
| -rw-r--r-- | source/blender/editors/mask/mask_select.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index dc204909577..cd1a47754f8 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -34,6 +34,7 @@ #include "BLI_utildefines.h" #include "BLI_rect.h" #include "BLI_lasso.h" +#include "BLI_math.h" #include "BKE_context.h" #include "BKE_mask.h" @@ -622,7 +623,7 @@ static int circle_select_exec(bContext *C, wmOperator *op) /* compute ellipse and position in unified coordinates */ ED_mask_get_size(sa, &width, &height); ED_mask_zoom(sa, ar, &zoomx, &zoomy); - width = height = MAX2(width, height); + width = height = max_ii(width, height); ellipse[0] = width * zoomx / radius; ellipse[1] = height * zoomy / radius; |