diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-04-16 01:02:08 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-04-16 01:02:08 +0400 |
| commit | 5496e87eee5951345ecb2d3f503342246fd8581e (patch) | |
| tree | 296cf327a299682d45dae08f5cba69506d02cd21 /source/blender/editors/physics | |
| parent | 86508076d8190a374bcd9c17785eb0802dd4c1ca (diff) | |
Fluid Simulation:
* Replaced the hard coded viscosity presets with Python ones.
* Added version check, so older files load fine.
Loading new files into 2.62 also works fine.
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 6a074a542c3..20fa4c5753f 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -98,19 +98,7 @@ static float get_fluid_viscosity(FluidsimSettings *settings) { - switch (settings->viscosityMode) { - case 0: /* unused */ - return -1.0; - case 2: /* water */ - return 1.0e-6; - case 3: /* some (thick) oil */ - return 5.0e-5; - case 4: /* ca. honey */ - return 2.0e-3; - case 1: /* manual */ - default: - return (1.0f/powf(10.0f, settings->viscosityExponent)) * settings->viscosityValue; - } + return (1.0f/powf(10.0f, settings->viscosityExponent)) * settings->viscosityValue; } static float get_fluid_rate(FluidsimSettings *settings) |