UPBGE: Fix parenting.

UPBGE · Jun 1, 2018 · 4b6dca0 · 4b6dca0
1 parent fba7bd3
commit 4b6dca0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -346,7 +346,7 @@ void KX_GameObject::SetParent(KX_GameObject *obj, bool addToCompound, bool ghost
 	KX_Scene *scene = GetScene();
 
 	// Not already parented to same object, no parenting loop, not the object itself
-	if (m_sgNode->GetParent() == parentSgNode || !m_sgNode->IsAncessor(parentSgNode) || this != obj) {
+	if (m_sgNode->GetParent() == parentSgNode || m_sgNode->IsAncessor(parentSgNode) || this == obj) {
 		return;
 	}
 
@@ -408,8 +408,7 @@ void KX_GameObject::SetParent(KX_GameObject *obj, bool addToCompound, bool ghost
 
 void KX_GameObject::RemoveParent()
 {
-	// check on valid node in case a python controller holds a reference to a deleted object
-	if (m_sgNode->GetParent()) {
+	if (!m_sgNode->GetParent()) {
 		return;
 	}