diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 05:50:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 05:50:22 +0400 |
| commit | 130b4429b0279b8be8afa3ce45e60a359b723add (patch) | |
| tree | 8b72d8827d499b74b71e24151844379c96f7e2ba /source/blender/blenkernel/intern/particle_system.c | |
| parent | 0811236da2d5c709e274d9442fd6fbda471c2136 (diff) | |
| parent | e06f206450b634737e3d2b310d1c702a994f28fe (diff) | |
svn merge -r41638:41648 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index c759641f6a9..0caad666226 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3177,7 +3177,7 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR mul_v3_fl(v1_tan, 1.0f - 0.01f * frict); /* surface_velocity is opposite to cm velocity */ - mul_v3_v3fl(vr_tan, v1_tan, -1.0f); + negate_v3_v3(vr_tan, v1_tan); /* get back to global coordinates */ add_v3_v3(v1_tan, vc_tan); |