Merge branch 'master' into physics3d-material

2018-01-14 14:40:57 +01:00
parent 18a4099958 0b2d5b9332
commit 4cb598c32b
320 changed files with 130259 additions and 277 deletions
--- a/SDK/include/NDK/Components/PhysicsComponent3D.inl
+++ b/SDK/include/NDK/Components/PhysicsComponent3D.inl
@@ -488,9 +488,9 @@ namespace Ndk
 	* \brief Gets the underlying physics object
 	* \return A reference to the physics object
 	*/
-	inline Nz::RigidBody3D& PhysicsComponent3D::GetRigidBody()
+	inline Nz::RigidBody3D* PhysicsComponent3D::GetRigidBody()
 	{
-		return *m_object.get();
+		return m_object.get();
 	}

 	/*!