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

Fixed ClippingNode not cleaning up _stencil correctly (#15814) 

* Fixed ClippingNode not cleaning up _stencil correctly

_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.

* Added onEnterXXX to ClippingNode::setStencil()

ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
This commit is contained in:
Aaron 2016-06-15 07:55:29 +01:00 committed by minggo
parent 925e938724
commit dd6fed7928
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos/2d/CCClippingNode.cpp
View File

@ -290,6 +290,7 @@ Node* ClippingNode::getStencil() const
void ClippingNode::setStencil(Node *stencil) void ClippingNode::setStencil(Node *stencil)
{ {
//early out if the stencil is already set
if (_stencil == stencil) if (_stencil == stencil)
return; return;
@ -303,9 +304,26 @@ void ClippingNode::setStencil(Node *stencil)
sEngine->retainScriptObject(this, stencil); sEngine->retainScriptObject(this, stencil);
} }
#endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS #endif // CC_ENABLE_GC_FOR_NATIVE_OBJECTS
CC_SAFE_RETAIN(stencil);
CC_SAFE_RELEASE(_stencil); //cleanup current stencil
if(_stencil != nullptr && _stencil->isRunning())
{
_stencil->onExitTransitionDidStart();
_stencil->onExit();
}
CC_SAFE_RELEASE_NULL(_stencil);
//initialise new stencil
_stencil = stencil; _stencil = stencil;
CC_SAFE_RETAIN(_stencil);
if(_stencil != nullptr && this->isRunning())
{
_stencil->onEnter();
if(this->_isTransitionFinished)
{
_stencil->onEnterTransitionDidFinish();
}
}
} }
bool ClippingNode::hasContent() const bool ClippingNode::hasContent() const