Integrating github/staging through commit ab87ed9

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
@@ -963,7 +963,6 @@ bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused
for (const ComponentAssetPair& pair : componentAssetPairs)
{
const AZ::TypeId& componentType = pair.first;
const AZ::Data::AssetId& assetId = pair.second;
componentsToAdd.push_back(componentType);
}
@@ -988,7 +987,6 @@ bool OutlinerListModel::DropMimeDataAssets(const QMimeData* data, [[maybe_unused
}
// Assign asset associated with each created component.
const AZ::Entity::ComponentArrayType& componentsAdded = addComponentsOutcome.GetValue()[targetEntityId].m_componentsAdded;
for (const ComponentAssetPair& pair : componentAssetPairs)
{
const AZ::TypeId& componentType = pair.first;