Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-04-23 09:09:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-04-23 09:09:30 +0300
commit87b3e62b3d2110d4701e49389492f1b3528c9cdf (patch)
tree0c588f3b123b1bac5490d44e870383dc72ab6527 /source/blender/editors/transform
parent0287b394680441b6836c43b8f01512c1c8e37800 (diff)
Cleanup: warnings
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform_conversions.c15
1 files changed, 9 insertions, 6 deletions
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 <string.h>
#include <math.h>
+#include <limits.h>
#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;
+ }
}
}
}