archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for [#25095] Particle systems and object with collision modifier bug

Browse Source 
* Collisions didn't take emitter object layer into account
This commit is contained in:
Janne Karhu
2010-12-10 08:29:46 +00:00
parent b12ca6a400
commit fe19e5336b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/effect.c
View File

@@ -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;

2
source/blender/blenkernel/intern/particle_system.c
View File

@@ -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) {