Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16094 from stevetranby/patch-1 

Match parent's camera mask when adding child.
This commit is contained in:
minggo 2016-07-13 16:33:17 +08:00 committed by GitHub
parent c5c846f6e1 f162ffe2ae
commit 261f1ef780
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/2d/CCNode.cpp
View File

@ -948,6 +948,7 @@ void Node::addChildHelper(Node* child, int localZOrder, int tag, const std::stri
child->setName(name); child->setName(name);
child->setParent(this); child->setParent(this);
child->setCameraMask(getCameraMask());
if( _running ) if( _running )
{ {