Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-18 17:10:35 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2018-12-18 17:10:35 +0300
commit37c2382a49ee47974d588ea363d87d5e81b1a4df (patch)
tree91f36d22267a91248926be1e08f759111ed29f8e /source/blender/blenkernel/intern/smoke.c
parent8c4ae8961cb2447cce64667b5dc40785f3b4709a (diff)
parentd542e55b096ba3d8e14cac2e4d314f0a5e759982 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
-rw-r--r--source/blender/blenkernel/intern/smoke.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 506725c89e8..7474df7bec6 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1310,6 +1310,7 @@ static void emit_from_particles(
sim.scene = scene;
sim.ob = flow_ob;
sim.psys = psys;
+ sim.psys->lattice_deform_data = psys_create_lattice_deform_data(&sim);
/* prepare curvemapping tables */
if ((psys->part->child_flag & PART_CHILD_USE_CLUMP_CURVE) && psys->part->clumpcurve)