Merge branch 'master' into nazara-next

2020-08-27 20:12:36 +02:00
parent 056b78c2f7 ee3b5347b8
commit b2a7e620e0
21 changed files with 617 additions and 27 deletions
--- a/src/Nazara/Physics2D/RigidBody2D.cpp
+++ b/src/Nazara/Physics2D/RigidBody2D.cpp
@@ -168,9 +168,9 @@ namespace Nz

 	void RigidBody2D::EnableSimulation(bool simulation)
 	{
-		if (m_isRegistered != simulation)
+		if (m_isSimulationEnabled != simulation)
 		{
-			m_isRegistered = simulation;
+			m_isSimulationEnabled = simulation;

 			if (simulation)
 				RegisterToSpace();
@@ -325,7 +325,7 @@ namespace Nz

 	bool RigidBody2D::IsSimulationEnabled() const
 	{
-		return m_isRegistered;
+		return m_isSimulationEnabled;
 	}

 	bool RigidBody2D::IsSleeping() const