birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into optimization/unused_files

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

# Conflicts:
#	Code/Editor/IEditorImpl.cpp
#	Code/Editor/IEditorImpl.h
#	Gems/LmbrCentral/Code/Tests/lmbrcentral_editor_tests_files.cmake
This commit is contained in:
Esteban Papp
2022-01-25 15:40:30 -08:00
parent 4d62351628 56e7e70735
commit 6fad254b59
871 changed files with 19489 additions and 7437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/AssetBuilder/AssetBuilderComponent.cpp
+1
View File
@@ -13,6 +13,7 @@
#include <AzCore/Component/ComponentApplication.h>
#include <AzCore/IO/IStreamer.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/IO/Streamer/FileRequest.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/Serialization/Utils.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+1 -1
View File
@@ -544,7 +544,7 @@ void ApplicationManagerBase::InitConnectionManager()
EBUS_EVENT(AssetProcessor::ConnectionBus, SendPerPlatform, 0, message, QString::fromUtf8(message.m_platform.c_str()));
};
bool result = QObject::connect(GetAssetCatalog(), &AssetProcessor::AssetCatalog::SendAssetMessage, connectionAndChangeMessagesThreadContext, forwardMessageFunction, Qt::QueuedConnection);
[[maybe_unused]] bool result = QObject::connect(GetAssetCatalog(), &AssetProcessor::AssetCatalog::SendAssetMessage, connectionAndChangeMessagesThreadContext, forwardMessageFunction, Qt::QueuedConnection);
AZ_Assert(result, "Failed to connect to AssetCatalog signal");
//Application manager related stuff
Code/Tools/AssetProcessor/native/utilities/BuilderManager.inl
+1 -1
View File
@@ -19,7 +19,7 @@ namespace AssetProcessor
TNetResponse netResponse;
netRequest.m_request = request;
AZ::u32 type;
[[maybe_unused]] AZ::u32 type;
QByteArray data;
AZStd::binary_semaphore wait;