From e1c45b5cdbe6029bb99188291d78fba1709350b4 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 24 Sep 2004 17:12:36 +0000 Subject: [PATCH] don't mask out high bits on old bam files --- panda/src/collide/collisionNode.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/collide/collisionNode.cxx b/panda/src/collide/collisionNode.cxx index 11388c2ba5..ba9510b60d 100644 --- a/panda/src/collide/collisionNode.cxx +++ b/panda/src/collide/collisionNode.cxx @@ -515,9 +515,9 @@ fillin(DatagramIterator &scan, BamReader *manager) { // We also introduced the concept of the CollisionNode-reserved // bits and the GeomNode-reserved bits with version 4.12. Prior // to that, CollisionNodes tended to have all bits set. Assume - // they only meant to have the CollisionNode bits set. - into_collide_mask &= get_default_collide_mask(); - _from_collide_mask &= get_default_collide_mask(); + // they didn't mean to have the GeomNode bits set. + into_collide_mask &= ~GeomNode::get_default_collide_mask(); + _from_collide_mask &= ~GeomNode::get_default_collide_mask(); set_into_collide_mask(into_collide_mask);