Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -31,6 +31,7 @@
#include <AzFramework/Input/System/InputSystemComponent.h>
#include <AzFramework/Platform/PlatformDefaults.h>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzFramework/Components/AzFrameworkConfigurationSystemComponent.h>
#include <AzToolsFramework/Archive/ArchiveComponent.h>
#include <AzToolsFramework/Asset/AssetDebugInfo.h>
@@ -192,6 +193,7 @@ namespace AssetBundler
for (auto iter = components.begin(); iter != components.end();)
{
if (*iter == azrtti_typeid<AzFramework::GameEntityContextComponent>() ||
*iter == azrtti_typeid<AzFramework::AzFrameworkConfigurationSystemComponent>() ||
*iter == azrtti_typeid<AzFramework::InputSystemComponent>() ||
*iter == azrtti_typeid<AzFramework::DrillerNetworkAgentComponent>() ||
*iter == azrtti_typeid<AZ::SliceSystemComponent>())