blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Philipp Oeser 2018-12-18 15:10:35 +01:00
parent 8c4ae8961c d542e55b09
commit 37c2382a49
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/smoke.c
View File

@ -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)