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

2016-11-23 14:07:52 +01:00
parent 9e84c397ba 3193aef29a
commit 8d86306933
100 changed files with 2585 additions and 1294 deletions
--- a/SDK/include/NDK/Components/CameraComponent.inl
+++ b/SDK/include/NDK/Components/CameraComponent.inl
@@ -101,7 +101,7 @@ namespace Ndk
 	* \brief Gets the field of view of the camera
 	* \return Field of view of the camera
 	*/
-	float CameraComponent::GetFOV() const
+	inline float CameraComponent::GetFOV() const
 	{
 		return m_fov;
 	}