diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 21:22:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-27 21:22:04 +0400 |
| commit | a73c3fe5c992777718431d5e5bb5f8a2c3b7a1bc (patch) | |
| tree | 51ca1d7a06715f0dde24196157c915b12da334c0 /source/blender/editors/animation/keyframes_edit.c | |
| parent | 9c8f1e2ef487483bc374feaed9ff709e07638623 (diff) | |
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
Diffstat (limited to 'source/blender/editors/animation/keyframes_edit.c')
| -rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index a2b5e2b1c8d..1ce05573e85 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -537,7 +537,7 @@ static short ok_bezier_frame(KeyframeEditData *ked, BezTriple *bezt) short ok = 0; /* frame is stored in f1 property (this float accuracy check may need to be dropped?) */ - #define KEY_CHECK_OK(_index) IS_EQ(bezt->vec[_index][0], ked->f1) + #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][0], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); #undef KEY_CHECK_OK @@ -577,7 +577,7 @@ static short ok_bezier_value(KeyframeEditData *ked, BezTriple *bezt) * - this float accuracy check may need to be dropped? * - should value be stored in f2 instead so that we won't have conflicts when using f1 for frames too? */ - #define KEY_CHECK_OK(_index) IS_EQ(bezt->vec[_index][1], ked->f1) + #define KEY_CHECK_OK(_index) IS_EQF(bezt->vec[_index][1], ked->f1) KEYFRAME_OK_CHECKS(KEY_CHECK_OK); #undef KEY_CHECK_OK @@ -697,7 +697,7 @@ void bezt_remap_times(KeyframeEditData *ked, BezTriple *bezt) static short snap_bezier_nearest(KeyframeEditData *UNUSED(ked), BezTriple *bezt) { if (bezt->f2 & SELECT) - bezt->vec[1][0]= (float)(floor(bezt->vec[1][0]+0.5)); + bezt->vec[1][0]= (float)(floorf(bezt->vec[1][0]+0.5f)); return 0; } |