RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix collide mask on flatten

This commit is contained in:
David Rose 2007-11-05 17:38:00 +00:00
parent 3c82ad32d2
commit 32bcebc766
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1678,7 +1678,11 @@ 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;
// The collide mask becomes the union of the two masks. This is
// important to preserve properties such as the default GeomNode
// bitmask.
cdataw->_into_collide_mask |= cdatar->_into_collide_mask;
TagData::const_iterator ti;
for (ti = cdatar->_tag_data.begin();