Revision: 27788
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27788
Author:   blendix
Date:     2010-03-27 13:16:24 +0100 (Sat, 27 Mar 2010)

Log Message:
-----------
Fix #21700: particles do not collide with linked objects.

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

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c  2010-03-27 
12:14:51 UTC (rev 27787)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c  2010-03-27 
12:16:24 UTC (rev 27788)
@@ -1408,7 +1408,7 @@
        }
        else {
                for(base = scene->base.first; base; base = base->next)
-                       if(self && (base->lay & self->lay)==0) 
+                       if(!self || (base->lay & self->lay)) 
                                add_collider_cache_object(&objs, base->object, 
self, 0);
        }
 


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to