diff options
| author | Miika Hamalainen <blender@miikah.org> | 2015-02-06 22:23:43 +0300 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2015-02-06 22:23:43 +0300 |
| commit | 1b85ca6fc0fc6c32fa8d66ae4c4160317ae0677e (patch) | |
| tree | bffac9645dab12c4afc9236657ad92a22ed9acb7 /source/blender/blenkernel/intern/smoke.c | |
| parent | a42553f986baa8f457b2b9db0b97d8e86bfca1cf (diff) | |
Fix T42950: Smoke particle flow doesn't work with high res and subframes unless "set size" option is ticked.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4c46875bd48..a34aa5009e6 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2131,6 +2131,9 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd if (sfs->source == MOD_SMOKE_FLOW_SOURCE_PARTICLES) { /* emit_from_particles() updates timestep internally */ emit_from_particles(collob, sds, sfs, &em_temp, scene, sdt); + if (!(sfs->flags & MOD_SMOKE_FLOW_USE_PART_SIZE)) { + hires_multiplier = 1; + } } else { /* MOD_SMOKE_FLOW_SOURCE_MESH */ /* update flow object frame */ |