diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-10 11:29:46 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-10 11:29:46 +0300 |
| commit | fe19e5336bfa819be3ed018cb7e05ca835ed72be (patch) | |
| tree | 977f8e25fa20244bfdacd78c47907846817c18ac /source/blender/blenkernel/intern | |
| parent | b12ca6a4000db09c81c80d32c249f6ab352627b9 (diff) | |
Fix for [#25095] Particle systems and object with collision modifier bug
* Collisions didn't take emitter object layer into account
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 24a95c58e36..51f2203b525 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -432,7 +432,7 @@ static float eff_calc_visibility(ListBase *colliders, EffectorCache *eff, Effect return visibility; if(!colls) - colls = get_collider_cache(eff->scene, NULL, NULL); + colls = get_collider_cache(eff->scene, eff->ob, NULL); if(!colls) return visibility; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 931339d90b4..333ca91d4b9 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3392,7 +3392,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) psys_update_effectors(sim); if(part->type != PART_HAIR) - sim->colliders = get_collider_cache(sim->scene, NULL, NULL); + sim->colliders = get_collider_cache(sim->scene, sim->ob, NULL); /* initialize physics type specific stuff */ switch(part->phystype) { |