Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2010-09-02 09:37:54 +0400
committerJanne Karhu <jhkarh@gmail.com>2010-09-02 09:37:54 +0400
commitb75eeac6bd618e7aad7f29f25f47105a884dd8c9 (patch)
tree64fd1288a4a7cf82bd01fd5e44786e680cf093ae /source/blender/blenkernel/intern/particle.c
parentddbfb05c84d1b20df82d8b1264d897dd55006695 (diff)
Fix for [#23274] curve guide force particles to born at the wolrd's origine
* Particle emitter location wasn't taken into account properly
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 681c48b0cf8..356f44dd757 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2009,6 +2009,10 @@ void precalc_guides(ParticleSimulationData *sim, ListBase *effectors)
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) {