[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31714] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#23274] curve guide force particles to born at the wolrd's origine

[Janne Karhu]

Revision: 31714
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31714
Author:   jhk
Date:     2010-09-02 07:37:54 +0200 (Thu, 02 Sep 2010)

Log Message:
-----------
Fix for [#23274] curve guide force particles to born at the wolrd's origine
* Particle emitter location wasn't taken into account properly

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	2010-09-02 04:53:05 UTC (rev 31713)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2010-09-02 05:37:54 UTC (rev 31714)
@@ -2009,6 +2009,10 @@
 
 	LOOP_PARTICLES {
 		psys_particle_on_emitter(sim->psmd,sim->psys->part->from,pa->num,pa->num_dmcache,pa->fuv,pa->foffset,state.co,0,0,0,0,0);
+		
+		mul_m4_v3(sim->ob->obmat, state.co);
+		mul_mat3_m4_v3(sim->ob->obmat, state.vel);
+		
 		pd_point_from_particle(sim, pa, &state, &point);
 
 		for(eff = effectors->first; eff; eff=eff->next) {