From 87b3e62b3d2110d4701e49389492f1b3528c9cdf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 23 Apr 2015 16:09:30 +1000 Subject: Cleanup: warnings --- source/blender/editors/space_view3d/view3d_draw.c | 4 ++-- source/blender/editors/transform/transform_conversions.c | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 0be1ad66ec8..520ad4f89b4 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1589,8 +1589,8 @@ unsigned int ED_view3d_backbuf_sample_rect( /* get x,y pixel coords from the offset * (manhatten distance in keeping with other screen-based selection) */ *r_dist = (float)( - abs(((tbuf - buf->rect) % size) - (size / 2)) + - abs(((tbuf - buf->rect) / size) - (size / 2))); + abs(((int)(tbuf - buf->rect) % size) - (size / 2)) + + abs(((int)(tbuf - buf->rect) / size) - (size / 2))); /* indices start at 1 here */ index = (*tbuf - min) + 1; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0cdc2b5eb6c..8aa26c32413 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -31,6 +31,7 @@ #include #include +#include #include "DNA_anim_types.h" #include "DNA_brush_types.h" @@ -3755,13 +3756,14 @@ static void createTransActionData(bContext *C, TransInfo *t) } else { bGPDframe *gpf_iter; - float min = FLT_MAX; + int min = INT_MAX; for (gpf_iter = gpl->frames.first; gpf_iter; gpf_iter = gpf->next) { if (gpf_iter->flag & GP_FRAME_SELECT) { if (FrameOnMouseSide(t->frame_side, (float)gpf_iter->framenum, cfra)) { - float val = fabsf(gpf->framenum - gpf_iter->framenum); - if (val < min) + int val = abs(gpf->framenum - gpf_iter->framenum); + if (val < min) { min = val; + } } } } @@ -3781,13 +3783,14 @@ static void createTransActionData(bContext *C, TransInfo *t) } else { MaskLayerShape *masklay_iter; - float min = FLT_MAX; + int min = INT_MAX; for (masklay_iter = masklay->splines_shapes.first; masklay_iter; masklay_iter = masklay_iter->next) { if (masklay_iter->flag & MASK_SHAPE_SELECT) { if (FrameOnMouseSide(t->frame_side, (float)masklay_iter->frame, cfra)) { - float val = fabsf(masklay_shape->frame - masklay_iter->frame); - if (val < min) + int val = abs(masklay_shape->frame - masklay_iter->frame); + if (val < min) { min = val; + } } } } -- cgit v1.2.3