Blender Git Loki
Git Commits -> Revision fc31bd2
Revision fc31bd2 by Sebastián Barschkis (fluid-mantaflow) July 7, 2018, 13:56 (GMT) |
fluid guiding overhaul - fluid guiding now has a separate cache. velocities from guiding objects can be baked into this cache - alternatively, another another (baked) fluid domain can be set as the parent. its velocities will then used for the guiding effect (e.g. use smoke sim to guide liquid sim) - minor other updates: refactored manta-script exporter, fixed liquid leak (fractions completely disabled now), naming cleanups, fix for smoke resume bake (was missing velocity reload) |
Commit Details:
Full Hash: fc31bd2950e3a0efe51da33bdeaba60653171f13
Parent Commit: ebaa0f0
Lines Changed: +982, -409
24 Modified Paths:
/intern/mantaflow/CMakeLists.txt (+1, -0) (Diff)
/intern/mantaflow/extern/manta_fluid_API.h (+3, -1) (Diff)
/intern/mantaflow/intern/FLUID.cpp (+286, -166) (Diff)
/intern/mantaflow/intern/FLUID.h (+3, -0) (Diff)
/intern/mantaflow/intern/manta_fluid_API.cpp (+15, -3) (Diff)
/intern/mantaflow/intern/manta_pp/omp/gitinfo.h (+1, -1) (Diff)
/intern/mantaflow/intern/manta_pp/omp/plugin/extforces.cpp (+48, -0) (Diff)
/intern/mantaflow/intern/manta_pp/omp/plugin/secondaryparticles.cpp (+36, -37) (Diff)
/intern/mantaflow/intern/manta_pp/omp/registration.cpp (+26, -0) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/gitinfo.h (+1, -1) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/plugin/extforces.cpp (+37, -0) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/plugin/secondaryparticles.cpp (+26, -27) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/registration.cpp (+26, -0) (Diff)
/intern/mantaflow/intern/strings/liquid_script.h (+62, -42) (Diff)
/intern/mantaflow/intern/strings/shared_script.h (+105, -60) (Diff)
/intern/mantaflow/intern/strings/smoke_script.h (+14, -17) (Diff)
/release/scripts/startup/bl_ui/properties_physics_smoke.py (+57, -36) (Diff)
/source/blender/blenkernel/intern/smoke.c (+61, -9) (Diff)
/source/blender/editors/physics/physics_fluid.c (+56, -1) (Diff)
/source/blender/editors/physics/physics_intern.h (+2, -0) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -0) (Diff)
/source/blender/makesdna/DNA_smoke_types.h (+25, -4) (Diff)
/source/blender/makesrna/intern/rna_smoke.c (+75, -4) (Diff)
/source/blender/modifiers/intern/MOD_smoke.c (+14, -0) (Diff)
/intern/mantaflow/extern/manta_fluid_API.h (+3, -1) (Diff)
/intern/mantaflow/intern/FLUID.cpp (+286, -166) (Diff)
/intern/mantaflow/intern/FLUID.h (+3, -0) (Diff)
/intern/mantaflow/intern/manta_fluid_API.cpp (+15, -3) (Diff)
/intern/mantaflow/intern/manta_pp/omp/gitinfo.h (+1, -1) (Diff)
/intern/mantaflow/intern/manta_pp/omp/plugin/extforces.cpp (+48, -0) (Diff)
/intern/mantaflow/intern/manta_pp/omp/plugin/secondaryparticles.cpp (+36, -37) (Diff)
/intern/mantaflow/intern/manta_pp/omp/registration.cpp (+26, -0) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/gitinfo.h (+1, -1) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/plugin/extforces.cpp (+37, -0) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/plugin/secondaryparticles.cpp (+26, -27) (Diff)
/intern/mantaflow/intern/manta_pp/tbb/registration.cpp (+26, -0) (Diff)
/intern/mantaflow/intern/strings/liquid_script.h (+62, -42) (Diff)
/intern/mantaflow/intern/strings/shared_script.h (+105, -60) (Diff)
/intern/mantaflow/intern/strings/smoke_script.h (+14, -17) (Diff)
/release/scripts/startup/bl_ui/properties_physics_smoke.py (+57, -36) (Diff)
/source/blender/blenkernel/intern/smoke.c (+61, -9) (Diff)
/source/blender/editors/physics/physics_fluid.c (+56, -1) (Diff)
/source/blender/editors/physics/physics_intern.h (+2, -0) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -0) (Diff)
/source/blender/makesdna/DNA_smoke_types.h (+25, -4) (Diff)
/source/blender/makesrna/intern/rna_smoke.c (+75, -4) (Diff)
/source/blender/modifiers/intern/MOD_smoke.c (+14, -0) (Diff)