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
@@ -193,7 +193,7 @@ namespace ImageProcessingAtom
AZ::Uuid sourceId = source->GetSourceUuid();
QAction* editImportSettingsAction = menu->addAction("Edit Texture Settings...", [sourceId, this]()
menu->addAction("Edit Texture Settings...", [sourceId, this]()
{
OpenSourceTextureFile(sourceId);
});
@@ -205,7 +205,7 @@ namespace ImageProcessingAtom
if (product->GetAssetType() == azrtti_typeid<AZ::RPI::StreamingImageAsset>())
{
AZ::Data::AssetId assetId = product->GetAssetId();
QAction* editImportSettingsAction = menu->addAction("Save as DDS...", [assetId, this]()
menu->addAction("Save as DDS...", [assetId, this]()
{
QString filePath = QFileDialog::getSaveFileName(nullptr, QString("Save to file"), m_lastSavedPath, QString("DDS file (*.dds)"));
if (filePath.isEmpty())