diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-10-27 21:19:55 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-10-27 21:19:55 +0400 |
| commit | c64fa6a344981476dc5ebd85e6e7d83c5b8221aa (patch) | |
| tree | 69bb4e2451180f453e47ecdbbf794dccb018f789 /source/blender/blenkernel/intern/smoke.c | |
| parent | b6da3611ebba8f4a2493531688def2bc8e65be63 (diff) | |
Smoke/Dynamic Paint: Allow use of fluid sim generated particles as emitter/brush.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index e357d687d83..443aed1fc41 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -951,7 +951,7 @@ static void em_freeData(EmissionMap *em) { static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, Scene *scene, float time, float dt) { - if (sfs && sfs->psys && sfs->psys->part && sfs->psys->part->type == PART_EMITTER) // is particle system selected + if (sfs && sfs->psys && sfs->psys->part && ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) // is particle system selected { ParticleSimulationData sim; ParticleSystem *psys = sfs->psys; |