From 88895df1d0d3201b841e666006edbf0c144a2e40 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 23 Nov 2016 14:07:20 +0100
Subject: [PATCH] SDK/Systems: Disable VelocitySystem if PhysicsComponent2D is
 present

---
 SDK/src/NDK/Systems/VelocitySystem.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/SDK/src/NDK/Systems/VelocitySystem.cpp b/SDK/src/NDK/Systems/VelocitySystem.cpp
index 4bc3b3a68..bc8042cd7 100644
--- a/SDK/src/NDK/Systems/VelocitySystem.cpp
+++ b/SDK/src/NDK/Systems/VelocitySystem.cpp
@@ -4,6 +4,7 @@
 
 #include <NDK/Systems/VelocitySystem.hpp>
 #include <NDK/Components/NodeComponent.hpp>
+#include <NDK/Components/PhysicsComponent2D.hpp>
 #include <NDK/Components/PhysicsComponent3D.hpp>
 #include <NDK/Components/VelocityComponent.hpp>
 
@@ -14,8 +15,8 @@ namespace Ndk
 	* \class Ndk::VelocitySystem
 	* \brief NDK class that represents the velocity system
 	*
-	* \remark This system is enabled if the entity owns the trait: NodeComponent and VelocityComponent
-	* but it's disabled with the trait: PhysicsComponent3D
+	* \remark This system is enabled if the entity owns the traits NodeComponent and VelocityComponent
+	* but it's disabled with the traits: PhysicsComponent2D, PhysicsComponent3D
 	*/
 
 	/*!
@@ -24,7 +25,7 @@ namespace Ndk
 
 	VelocitySystem::VelocitySystem()
 	{
-		Excludes<PhysicsComponent3D>();
+		Excludes<PhysicsComponent2D, PhysicsComponent3D>();
 		Requires<NodeComponent, VelocityComponent>();
 		SetUpdateOrder(10); //< Since some systems may want to stop us
 	}