[Bf-blender-cvs] [1b85ca6] master: Fix T42950: Smoke particle flow doesn't work with high res and subframes unless "set size" option is ticked.

[Miika Hamalainen]

Commit: 1b85ca6fc0fc6c32fa8d66ae4c4160317ae0677e
Author: Miika Hamalainen
Date:   Fri Feb 6 21:23:43 2015 +0200
Branches: master
https://developer.blender.org/rB1b85ca6fc0fc6c32fa8d66ae4c4160317ae0677e

Fix T42950: Smoke particle flow doesn't work with high res and subframes unless "set size" option is ticked.

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 4c46875..a34aa50 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 */