diff options
| author | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
| commit | 2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (patch) | |
| tree | 4f9c827389a23a431f8771b4ca02f410860c0242 /source/blender/blenkernel/intern/smoke.c | |
| parent | f64db794ee690f05905ace0a66d81d2e75549b90 (diff) | |
| parent | 34ad6da4a06ef46cd19945f61cc5f968538546a8 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index d6858e2d4d2..bb8fd18ea58 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1402,9 +1402,9 @@ static void emit_from_particles(Object *flow_ob, Scene *scene, float dt) { + /* Is particle system selected. */ if (sfs && sfs->psys && sfs->psys->part && - ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) // is particle system selected - { + ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) { ParticleSimulationData sim; ParticleSystem *psys = sfs->psys; float *particle_pos; |