[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35748] trunk/blender/source/blender/ blenkernel/intern/effect.c: Particle charge effector wasn' t working properly.

[Janne Karhu]

Revision: 35748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35748
Author:   jhk
Date:     2011-03-24 12:12:54 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Particle charge effector wasn't working properly.
* Probably just forgot this code somewhere a long time ago.

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	2011-03-24 11:41:00 UTC (rev 35747)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2011-03-24 12:12:54 UTC (rev 35748)
@@ -361,13 +361,19 @@
 
 void pd_point_from_particle(ParticleSimulationData *sim, ParticleData *pa, ParticleKey *state, EffectedPoint *point)
 {
+	ParticleSettings *part = sim->psys->part;
 	point->loc = state->co;
 	point->vel = state->vel;
 	point->index = pa - sim->psys->particles;
 	point->size = pa->size;
-	/* TODO: point->charge */
-	point->charge = 1.0f;
+	point->charge = 0.0f;
+	
+	if(part->pd && part->pd->forcefield == PFIELD_CHARGE)
+		point->charge += part->pd->f_strength;
 
+	if(part->pd2 && part->pd2->forcefield == PFIELD_CHARGE)
+		point->charge += part->pd2->f_strength;
+
 	point->vel_to_sec = 1.0f;
 	point->vel_to_frame = psys_get_timestep(sim);