sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Node: Improved SetParent check 

Former-commit-id: f9863603ee5f4b2d31b66716fa58f9749f5271ae
This commit is contained in:
Lynix 2015-05-06 20:20:27 +02:00
parent e55b4edd0c
commit 045aa86c9c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Nazara/Utility/Node.cpp
View File

@ -416,10 +416,17 @@ void NzNode::SetInitialScale(float scaleX, float scaleY, float scaleZ)
void NzNode::SetParent(const NzNode* node, bool keepDerived) void NzNode::SetParent(const NzNode* node, bool keepDerived)
{ {
#if NAZARA_UTILITY_SAFE #if NAZARA_UTILITY_SAFE
if (node == this) // On vérifie que le node n'est pas son propre parent
const NzNode* parentNode = node;
while (parentNode)
{ {
NazaraError("A node cannot be it's own parent"); if (parentNode == this)
return; {
NazaraError("A node cannot be it's own parent");
return;
}
parentNode = parentNode->GetParent();
} }
#endif #endif