Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam

2016-02-02 15:13:00 +01:00
parent df05f1909b 0e5f6da9a9
commit 7236da09b4
81 changed files with 1412 additions and 618 deletions
@@ -86,7 +86,7 @@ class ComponentWrapperFactory
 {
 public:
    ComponentWrapperFactory() = default;
-    ComponentWrapperFactory(std::string componentTypeName, std::size_t allocation = 0)
+    ComponentWrapperFactory(std::string componentTypeName, unsigned int allocation = 0)
    {
        m_ComponentInfo.Name = componentTypeName;
        m_ComponentInfo.Meta->Allocation = allocation;