[Bf-blender-cvs] [d542e55b096] master: Fix T55105: Smoke Emission from particles was ignoring lattice deformer on the particles

Philipp Oeser noreply at git.blender.org
Tue Dec 18 15:09:38 CET 2018


Commit: d542e55b096ba3d8e14cac2e4d314f0a5e759982
Author: Philipp Oeser
Date:   Tue May 22 09:25:23 2018 +0200
Branches: master
https://developer.blender.org/rBd542e55b096ba3d8e14cac2e4d314f0a5e759982

Fix T55105: Smoke Emission from particles was ignoring lattice deformer
on the particles

===================================================================

M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 4c1d3751543..06474115cdf 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1286,6 +1286,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)



More information about the Bf-blender-cvs mailing list