From 3ed81eeccf19daef6ca3b8f7e5035ceef621bd19 Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Thu, 25 Mar 2010 21:43:36 +0000 Subject: BGE: [#19836] Recursive Parenting in game crashes Blender. Added parenting loop detection. --- source/gameengine/SceneGraph/SG_Node.cpp | 6 ++++++ source/gameengine/SceneGraph/SG_Node.h | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'source/gameengine/SceneGraph') diff --git a/source/gameengine/SceneGraph/SG_Node.cpp b/source/gameengine/SceneGraph/SG_Node.cpp index 2436f6ecb55..706568fc3fe 100644 --- a/source/gameengine/SceneGraph/SG_Node.cpp +++ b/source/gameengine/SceneGraph/SG_Node.cpp @@ -150,6 +150,12 @@ GetRootSGParent( return (m_SGparent ? (const SG_Node*) m_SGparent->GetRootSGParent() : (const SG_Node*) this); } +bool SG_Node::IsAncessor(const SG_Node* child) const +{ + return (!child->m_SGparent) ? false : + (child->m_SGparent == this) ? true : IsAncessor(child->m_SGparent); +} + void SG_Node:: DisconnectFromParent( diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h index 78fa61c019e..5d2bac2b955 100644 --- a/source/gameengine/SceneGraph/SG_Node.h +++ b/source/gameengine/SceneGraph/SG_Node.h @@ -77,6 +77,13 @@ public: SG_Node* child ); + /** + * Return true if the node is the ancessor of child + */ + bool + IsAncessor( + const SG_Node* child + ) const; /** * Get the current list of children. Do not use this interface for * adding or removing children please use the methods of this class for -- cgit v1.2.3