Merge branch 'master' into enet_wip_nothing_to_see_here

SDK/include/NDK/BaseComponent.hpp

@@ -29,6 +29,7 @@ namespace Ndk
 
 			virtual std::unique_ptr<BaseComponent> Clone() const = 0;
 
+			inline const EntityHandle& GetEntity() const;
 			ComponentIndex GetIndex() const;
 
 			inline static ComponentIndex GetMaxComponentIndex();

SDK/include/NDK/BaseComponent.inl

@@ -19,11 +19,19 @@ namespace Ndk
 	{
 	}
 
+	/*!
+	* \brief Gets the entity owning this component
+	* \return A handle to the entity owning this component, may be invalid if no entity owns it.
+	*/
+	inline const EntityHandle& BaseComponent::GetEntity() const
+	{
+		return m_entity;
+	}
+
 	/*!
 	* \brief Gets the index of the component
 	* \return Index of the component
 	*/
-
 	inline ComponentIndex BaseComponent::GetIndex() const
 	{
 		return m_componentIndex;