[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31738] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#22387] Collider stickiness seems to have broke

[Janne Karhu]

Revision: 31738
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31738
Author:   jhk
Date:     2010-09-03 09:47:10 +0200 (Fri, 03 Sep 2010)

Log Message:
-----------
Fix for [#22387] Collider stickiness seems to have broke
* Note that this fix might slightly change the simulation results of some files that use the stickiness value, but lowering the value should fix these issues.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-03 07:25:37 UTC (rev 31737)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-09-03 07:47:10 UTC (rev 31738)
@@ -3055,7 +3055,7 @@
 					
 					/* Stickness to surface */
 					normalize_v3(nor_vec);
-					madd_v3_v3fl(pa->state.vel, nor_vec, -pd->pdef_stickness);
+					madd_v3_v3fl(pa->state.vel, col.nor, -pd->pdef_stickness);
 				}
 
 				col.t = dt;