diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-02 06:08:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-02 06:08:33 +0400 |
| commit | 69bd72c3b6aa1fdaab0c1232a6ba1e3e4c9029fa (patch) | |
| tree | bba65f8473ee4c3c2b6650f567964955b8611940 /source/blender/blenkernel/intern/fmodifier.c | |
| parent | fb994b3c857bdf3a7313da046580c0fb76e8b620 (diff) | |
quiet gcc float -> double promotion warnings.
Diffstat (limited to 'source/blender/blenkernel/intern/fmodifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 25d6860cb50..844f25e6d21 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -346,7 +346,7 @@ static void fcm_fn_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, floa case FCM_GENERATOR_FN_LN: /* natural log */ { /* check that value is greater than 1? */ - if (arg > 1.0f) { + if (arg > 1.0) { fn= log; } else { @@ -358,7 +358,7 @@ static void fcm_fn_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, floa case FCM_GENERATOR_FN_SQRT: /* square root */ { /* no negative numbers */ - if (arg > 0.0f) { + if (arg > 0.0) { fn= sqrt; } else { @@ -374,7 +374,7 @@ static void fcm_fn_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, floa /* execute function callback to set value if appropriate */ if (fn) { - float value= (float)(data->amplitude*fn(arg) + data->value_offset); + float value= (float)(data->amplitude*(float)fn(arg) + data->value_offset); if (data->flag & FCM_GENERATOR_ADDITIVE) *cvalue += value; |