diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-14 11:30:11 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-14 11:41:00 +0300 |
| commit | 13769bcbe5ccce70736ff73107d9284396043379 (patch) | |
| tree | 62a1528e060b9a16e549a889974b2194f646ee06 /source/blender/blenkernel/intern/effect.c | |
| parent | de6a86611440568277dce1ea91135dc9611224ff (diff) | |
Fluid: Rename smoke flow forces to fluid flow forces
Better to use more general term since in theory these forces can be used for smoke and liquid.
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index bfb03dea39c..fe2c9ed51b8 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -113,7 +113,7 @@ PartDeflect *BKE_partdeflect_new(int type) case PFIELD_TEXTURE: pd->f_size = 1.0f; break; - case PFIELD_SMOKEFLOW: + case PFIELD_FLUIDFLOW: pd->f_flow = 1.0f; break; } @@ -1024,7 +1024,7 @@ static void do_physical_effector(EffectorCache *eff, mul_v3_fl(force, -efd->falloff * fac * (strength * fac + damp)); break; - case PFIELD_SMOKEFLOW: + case PFIELD_FLUIDFLOW: zero_v3(force); #ifdef WITH_FLUID if (pd->f_source) { @@ -1046,7 +1046,7 @@ static void do_physical_effector(EffectorCache *eff, if (pd->flag & PFIELD_DO_LOCATION) { madd_v3_v3fl(total_force, force, 1.0f / point->vel_to_sec); - if (ELEM(pd->forcefield, PFIELD_HARMONIC, PFIELD_DRAG, PFIELD_SMOKEFLOW) == 0 && + if (ELEM(pd->forcefield, PFIELD_HARMONIC, PFIELD_DRAG, PFIELD_FLUIDFLOW) == 0 && pd->f_flow != 0.0f) { madd_v3_v3fl(total_force, point->vel, -pd->f_flow * efd->falloff); } |