[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34684] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#25955] Hair paths under force field influence look jagged

[Janne Karhu]

Revision: 34684
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34684
Author:   jhk
Date:     2011-02-07 10:54:55 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
Fix for [#25955] Hair paths under force field influence look jagged
* Effectors were applied wrong for hair.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c   2011-02-07 
10:50:35 UTC (rev 34683)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c   2011-02-07 
10:54:55 UTC (rev 34684)
@@ -2246,12 +2246,13 @@
 
        normalize_v3(force);
 
-       VECADDFAC(ca->co, (ca-1)->co, force, *length);
+       if(k < steps)
+               sub_v3_v3v3(vec, (ca+1)->co, ca->co);
 
-       if(k < steps) {
-               sub_v3_v3v3(vec, (ca+1)->co, ca->co);
+       madd_v3_v3v3fl(ca->co, (ca-1)->co, force, *length);
+
+       if(k < steps)
                *length = len_v3(vec);
-       }
 }
 static int check_path_length(int k, ParticleCacheKey *keys, ParticleCacheKey 
*state, float max_length, float *cur_length, float length, float *dvec)
 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs