[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33587] trunk/blender/source/blender/ blenkernel/intern: Fix for [#25095] Particle systems and object with collision modifier bug

[Janne Karhu]

Revision: 33587
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33587
Author:   jhk
Date:     2010-12-10 09:29:46 +0100 (Fri, 10 Dec 2010)

Log Message:
-----------
Fix for [#25095] Particle systems and object with collision modifier bug
* Collisions didn't take emitter object layer into account

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/effect.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2010-12-10 06:08:11 UTC (rev 33586)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2010-12-10 08:29:46 UTC (rev 33587)
@@ -432,7 +432,7 @@
 		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;

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-12-10 06:08:11 UTC (rev 33586)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2010-12-10 08:29:46 UTC (rev 33587)
@@ -3392,7 +3392,7 @@
 	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) {