Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
This commit is contained in:
Esteban Papp
2021-08-25 11:47:19 -07:00
400 changed files with 1886 additions and 46899 deletions
@@ -23,7 +23,6 @@
#include <AzCore/Utils/Utils.h>
#include <AzFramework/Asset/AssetCatalogComponent.h>
#include <AzFramework/Driller/RemoteDrillerInterface.h>
#include <AzFramework/Entity/GameEntityContextComponent.h>
#include <AzFramework/FileTag/FileTagComponent.h>
#include <AzFramework/Input/System/InputSystemComponent.h>
@@ -169,7 +168,6 @@ namespace AssetBundler
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>())
{
// Asset Bundler does not require the above components to be active