Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 30 Aug 2012 21:15:14 +0000 (14:15 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 30 Aug 2012 21:15:14 +0000 (14:15 -0700)
src/libs/ck-libs/collide/collide_serial.C

index 87759894df7660a17762a6a87e7e9cefebfd3702..ab82f5145ef4061ea382541c75a7814fc6985618 100644 (file)
@@ -288,6 +288,7 @@ static void simpleFindCollisions(const CollideOctant &o,CollisionList &dest)
 
 void CollideOctant::findCollisions(int splitAxis,CollisionList &dest)
 {
+       if (getHome()==0) return; /* nothing to do */
 #if COLLIDE_IS_RECURSIVE
        STATS(recursiveCalls++)