diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
| commit | d0412a1981266064aab38ca47f5d72ef9192e783 (patch) | |
| tree | 754a541f99f511cb65c66256b7a8dca7d2673279 /source/blender/editors/physics | |
| parent | 936af71e9755d1f1aab05576dabb7eea73a962c2 (diff) | |
| parent | 4acab3eb33db20eef89d0159199429c690b0f2df (diff) | |
svn merge ^/trunk/blender -r43864:43887
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index dbc153de108..c528d8cd078 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -109,7 +109,7 @@ static float get_fluid_viscosity(FluidsimSettings *settings) return 2.0e-3; case 1: /* manual */ default: - return (1.0/pow(10.0, settings->viscosityExponent)) * settings->viscosityValue; + return (1.0f/powf(10.0f, settings->viscosityExponent)) * settings->viscosityValue; } } |