From 7c710b165623744c42045de0b40076ad679659a7 Mon Sep 17 00:00:00 2001 From: Lendemor Date: Fri, 9 Dec 2016 15:47:45 +0100 Subject: [PATCH] set m_parent to nullptr when removing child from a container --- src/scene/containernode.cpp | 1 + src/scene/graphicalcontainernode.cpp | 2 +- src/scene/meshnode.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scene/containernode.cpp b/src/scene/containernode.cpp index e2c90c3..0ec47df 100644 --- a/src/scene/containernode.cpp +++ b/src/scene/containernode.cpp @@ -26,6 +26,7 @@ void ContainerNode::removeChild(SceneNode* node) if(*it == node) { m_children.erase(it); + node->m_parent = nullptr; // break; } } diff --git a/src/scene/graphicalcontainernode.cpp b/src/scene/graphicalcontainernode.cpp index 6eddf1c..81fbdf4 100644 --- a/src/scene/graphicalcontainernode.cpp +++ b/src/scene/graphicalcontainernode.cpp @@ -32,8 +32,8 @@ void GraphicalContainerNode::removeChild(GraphicalNode *node) if(*it == node) { m_children.erase(it); + node->m_parent = nullptr; } } } - } diff --git a/src/scene/meshnode.h b/src/scene/meshnode.h index 903ba00..8f3f138 100644 --- a/src/scene/meshnode.h +++ b/src/scene/meshnode.h @@ -13,7 +13,6 @@ class btIndexedMesh; */ class MeshNode : public GraphicalNode - { GeometryNode m_geometry; btIndexedMesh *bulletMesh;