[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16248] trunk/blender/source/blender/ blenkernel/intern/effect.c: Effector fall-off power was off by one for spherical, magnet, harmonic and charge fields.

[Janne Karhu]

Revision: 16248
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16248
Author:   jhk
Date:     2008-08-25 13:46:55 +0200 (Mon, 25 Aug 2008)

Log Message:
-----------
Effector fall-off power was off by one for spherical, magnet, harmonic and charge fields. For example a square fall-off was reduced to linear etc.

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

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2008-08-25 11:09:19 UTC (rev 16247)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2008-08-25 11:46:55 UTC (rev 16248)
@@ -406,12 +406,15 @@
 			else
 				VecCopyf(mag_vec,vec_to_part);
 
+			Normalize(mag_vec);
+
 			VecMulf(mag_vec,force_val*falloff);
 			VecAddf(field,field,mag_vec);
 			break;
 
 		case PFIELD_VORTEX:
 			Crossf(mag_vec,eff_vel,vec_to_part);
+
 			Normalize(mag_vec);
 
 			VecMulf(mag_vec,force_val*distance*falloff);
@@ -425,6 +428,8 @@
 				/* magnetic field of a moving charge */
 				Crossf(temp,eff_vel,vec_to_part);
 
+			Normalize(temp);
+
 			Crossf(temp2,velocity,temp);
 			VecAddf(mag_vec,mag_vec,temp2);
 
@@ -437,6 +442,8 @@
 			else
 				VecCopyf(mag_vec,vec_to_part);
 
+			Normalize(mag_vec);
+
 			VecMulf(mag_vec,force_val*falloff);
 			VecSubf(field,field,mag_vec);
 
@@ -451,6 +458,8 @@
 			else
 				VecCopyf(mag_vec,vec_to_part);
 
+			Normalize(mag_vec);
+
 			VecMulf(mag_vec,charge*force_val*falloff);
 			VecAddf(field,field,mag_vec);
 			break;