Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

2017-02-08 16:28:09 +01:00 · 2017-02-08 16:28:09 +01:00 · 26945bb10e
parent f103121cad 4df5ec776c
commit 26945bb10e
1 changed files with 6 additions and 1 deletions
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NDK/Entity.cpp
@ -158,11 +158,16 @@ namespace Ndk
 		}
 		m_systemBits.Clear();

-		UnregisterAllHandles();
+		// We properly destroy each component
+		for (std::size_t i = m_componentBits.FindFirst(); i != m_componentBits.npos; i = m_componentBits.FindNext(i))
+			m_components[i]->SetEntity(nullptr);

 		m_components.clear();
 		m_componentBits.Reset();

+		// And then free every handle
+		UnregisterAllHandles();
+
 		m_valid = false;
 	}