Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2010-10-27 18:56:53 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-10-27 18:56:53 +0400
commit7a569402078e4d4cb5b905645e8466e653bf6e1a (patch)
treefb2a64ecff2011244e88eac48ff5cacdd1d66b46 /source
parent2777ba74b04dc6d3f4479634f8feaf361464a574 (diff)
Fix for [#24401] Fluid particles leak through walls of moving object
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/particle_system.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index be616d9922c..a4c0776f5df 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -3076,8 +3076,8 @@ static void deflect_particle(ParticleSimulationData *sim, int p, float dfra, flo
col.t = df;
}
else {
- /* final chance to prevent failure, so don't do anything fancy */
- copy_v3_v3(pa->state.co, co);
+ /* final chance to prevent failure, so stick to the surface and hope for the best */
+ madd_v3_v3v3fl(pa->state.co, co, col.vel, dt2);
copy_v3_v3(pa->state.vel, v0);
}
}