Merge branch 'master' into reflection-mapping

2017-02-18 15:07:17 +01:00
parent f99d465760 ee9712fdcd
commit ead54e1c30
37 changed files with 478 additions and 169 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;
 	}