Browse Source

copy_all_properties() should copy into_colilde_mask too

David Rose 18 years ago
parent
commit
d86c60305c
2 changed files with 4 additions and 1 deletions
  1. 3 1
      panda/src/pgraph/nodePath.I
  2. 1 0
      panda/src/pgraph/pandaNode.cxx

+ 3 - 1
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

+ 1 - 0
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();