[Bf-blender-cvs] [443d5672347] fluid-mantaflow: added particle velocity scaling

[Sebastián Barschkis]

Commit: 443d5672347cf656db2cd458ab583f65c1b2e994
Author: Sebastián Barschkis
Date:   Fri Jun 16 11:13:00 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB443d5672347cf656db2cd458ab583f65c1b2e994

added particle velocity scaling

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

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 1b3cf3d60e6..b1e21aa67cc 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3842,6 +3842,11 @@ static void particles_manta_step(ParticleSimulationData *sim, int UNUSED(cfra),
 					pa->state.vel[1] = liquid_get_particle_velocity_y_at(sds->fluid, p);
 					pa->state.vel[2] = liquid_get_particle_velocity_z_at(sds->fluid, p);
 
+					// scale down
+					pa->state.vel[0] *= 1.0f / liquid_get_particle_dim_x(sds->fluid);
+					pa->state.vel[1] *= 1.0f / liquid_get_particle_dim_y(sds->fluid);
+					pa->state.vel[2] *= 1.0f / liquid_get_particle_dim_z(sds->fluid);
+
 //					printf("pa->state.vel[0]: %f, pa->state.vel[1]: %f, pa->state.vel[2]: %f\n", pa->state.vel[0], pa->state.vel[1], pa->state.vel[2]);
 
 					// set default angular velocity and particle rotation