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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ namespace GraphCanvas
}
AZ::Data::AssetHandler::LoadResult TranslationAssetHandler::LoadAssetData(
const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
[[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset, AZStd::shared_ptr<AZ::Data::AssetDataStream> stream,
const AZ::Data::AssetFilterCB&)
{
AZ::Data::AssetHandler::LoadResult result = AZ::Data::AssetHandler::LoadResult::LoadComplete;
Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h
-1
View File
@@ -46,7 +46,6 @@ namespace GraphCanvas
TranslationAsset(const AZ::Data::AssetId& assetId = AZ::Data::AssetId(), AZ::Data::AssetData::AssetStatus status = AZ::Data::AssetData::AssetStatus::NotLoaded);
TranslationAsset(const TranslationAsset& rhs) = default;
~TranslationAsset() = default;
static const char* GetDisplayName() { return "Graph Canvas Translation"; }