soc-2008-mxcurioni: merged changes to revision 15705
[blender.git] / source / blender / blenkernel / intern / collision.c
index 26c5d186d8703b995d22aca66ccd1ede9d293ece..6dfb77504fb3d7cf6babdf2104fc0dd07fc620f0 100644 (file)
@@ -1437,6 +1437,9 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
 
                                        if(coll_ob == self)
                                                continue;
+                                       
+                                       if( !collmd->bvhtree)
+                                               continue;
 
                                        if(numobj >= maxobj)
                                        {