From d86c60305c41decf61ddb0e49aa353f67b6e4156 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 26 Oct 2007 22:11:11 +0000 Subject: [PATCH] copy_all_properties() should copy into_colilde_mask too --- panda/src/pgraph/nodePath.I | 4 +++- panda/src/pgraph/pandaNode.cxx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/panda/src/pgraph/nodePath.I b/panda/src/pgraph/nodePath.I index 2de287ba97..ca8eacf0bc 100644 --- a/panda/src/pgraph/nodePath.I +++ b/panda/src/pgraph/nodePath.I @@ -2051,7 +2051,9 @@ get_collide_mask() const { // Access: Published // Description: Recursively applies the indicated CollideMask to the // into_collide_masks for all nodes at this level and -// below. Only nodes +// below. If node_type is not TypeHandle::none(), then +// only nodes matching (or inheriting from) the +// indicated PandaNode subclass are modified. // // The default is to change all bits, but if // bits_to_change is not all bits on, then only the bits diff --git a/panda/src/pgraph/pandaNode.cxx b/panda/src/pgraph/pandaNode.cxx index 2d4bacb6ee..80b54e5d13 100644 --- a/panda/src/pgraph/pandaNode.cxx +++ b/panda/src/pgraph/pandaNode.cxx @@ -1678,6 +1678,7 @@ copy_all_properties(PandaNode *other) { cdataw->_effects = cdatar->_effects; cdataw->_draw_control_mask = cdatar->_draw_control_mask; cdataw->_draw_show_mask = cdatar->_draw_show_mask; + cdataw->_into_collide_mask = cdatar->_into_collide_mask; TagData::const_iterator ti; for (ti = cdatar->_tag_data.begin();