[Bf-blender-cvs] [d1abec20267] fluid-mantaflow: use particle size from particle settings UI for manta particles

[Sebastián Barschkis]

Commit: d1abec2026791df52b3a14ceeb091ba769ba3294
Author: Sebastián Barschkis
Date:   Wed Nov 29 15:27:42 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBd1abec2026791df52b3a14ceeb091ba769ba3294

use particle size from particle settings UI for manta particles

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 7d6c6996ade..90400e84ab9 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3882,8 +3882,10 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra),
 				if ((flagActivePart & PDELETE)==0) { // mantaflow convention: PDELETE == inactive particle
 					activeParts++;
 
-					pa->size = sds->particle_radius;
-					pa->size /= 10.0f;
+					// Use particle system settings for particle size
+					pa->size = part->size;
+					if (part->randsize > 0.0f)
+						pa->size *= 1.0f - part->randsize * psys_frand(psys, p + 1);
 					
 					// Get size (dimension) but considering scaling scaling
 					copy_v3_v3(cell_size_scaled, sds->cell_size);