Merge remote-tracking branch 'origin/Animations' into WeaponSystem

2016-02-10 20:47:33 +01:00
parent 0825b10c75 224e95f34a
commit 6396925b68
14 changed files with 912 additions and 364 deletions
@@ -47,7 +47,7 @@ ComponentWrapper ComponentPool::Allocate(EntityID entity)

 ComponentWrapper ComponentPool::GetByEntity(EntityID ent)
 {
-    return ComponentWrapper(m_ComponentInfo, m_EntityToComponent.at(ent));
+     return ComponentWrapper(m_ComponentInfo, m_EntityToComponent.at(ent));
 }

 bool ComponentPool::KnowsEntity(EntityID ent)