TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

copy_all_properties() should copy into_colilde_mask too

Browse Source
This commit is contained in:
David Rose 2007-10-26 22:11:11 +00:00
parent 92881a8f91
commit d86c60305c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/pgraph/nodePath.I
View File

@ -2051,7 +2051,9 @@ get_collide_mask() const {
// Access: Published // Access: Published
// Description: Recursively applies the indicated CollideMask to the // Description: Recursively applies the indicated CollideMask to the
// into_collide_masks for all nodes at this level and // 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 // The default is to change all bits, but if
// bits_to_change is not all bits on, then only the bits // bits_to_change is not all bits on, then only the bits

1
panda/src/pgraph/pandaNode.cxx
View File

@ -1678,6 +1678,7 @@ copy_all_properties(PandaNode *other) {
cdataw->_effects = cdatar->_effects; cdataw->_effects = cdatar->_effects;
cdataw->_draw_control_mask = cdatar->_draw_control_mask; cdataw->_draw_control_mask = cdatar->_draw_control_mask;
cdataw->_draw_show_mask = cdatar->_draw_show_mask; cdataw->_draw_show_mask = cdatar->_draw_show_mask;
cdataw->_into_collide_mask = cdatar->_into_collide_mask;
TagData::const_iterator ti; TagData::const_iterator ti;
for (ti = cdatar->_tag_data.begin(); for (ti = cdatar->_tag_data.begin();