diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:50:14 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 18:37:01 +0300 |
| commit | d27ccf990c2b957a10f4676e3153f907829a4b22 (patch) | |
| tree | 48667db9d5f51e3c951cb1106566a53db21d9adf /source/blender/blenkernel/intern/effect.c | |
| parent | 7b87d3d34ec5bbaf777bdc27abdb69600915fce1 (diff) | |
Mantaflow [Part 6]: Updates in /blender/source
A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming.
Reviewed By: sergey
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3855
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index ffab82b75af..91f83110675 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -62,7 +62,7 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_smoke.h" +#include "BKE_fluid.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_physics.h" @@ -71,13 +71,6 @@ #include "RE_render_ext.h" #include "RE_shader_ext.h" -/* fluid sim particle import */ -#ifdef WITH_MOD_FLUID -# include "LBM_fluidsim.h" -# include <zlib.h> -# include <string.h> -#endif // WITH_MOD_FLUID - EffectorWeights *BKE_effector_add_weights(Collection *collection) { EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights"); @@ -1033,7 +1026,7 @@ static void do_physical_effector(EffectorCache *eff, zero_v3(force); if (pd->f_source) { float density; - if ((density = BKE_smoke_get_velocity_at(pd->f_source, point->loc, force)) >= 0.0f) { + if ((density = BKE_fluid_get_velocity_at(pd->f_source, point->loc, force)) >= 0.0f) { float influence = strength * efd->falloff; if (pd->flag & PFIELD_SMOKE_DENSITY) { influence *= density; |