diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h index b385f21a5e..6a21a8a2df 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h @@ -73,9 +73,6 @@ namespace AtomToolsFramework //! Can the document be saved virtual bool IsSavable() const = 0; - //! Get a list of warnings about the data that would be good to know before saving - virtual AZStd::vector GetDataWarnings() const { return {}; } - //! Returns true if there are reversible modifications to the document virtual bool CanUndo() const = 0; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp index 416babcbde..3a392c1413 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp @@ -365,24 +365,6 @@ namespace AtomToolsFramework return false; } - AZStd::vector dataWarnings; - AtomToolsDocumentRequestBus::EventResult(dataWarnings, documentId, &AtomToolsDocumentRequestBus::Events::GetDataWarnings); - if (!dataWarnings.empty()) - { - AZStd::string allWarnings; - AzFramework::StringFunc::Join(allWarnings, dataWarnings.begin(), dataWarnings.end(), "\n"); - - auto result = QMessageBox::warning( - QApplication::activeWindow(), QString("Data Warnings"), - QString("Are you sure you want to save with the following data warnings? \n\n%1").arg(allWarnings.c_str()), - QMessageBox::StandardButton::Yes, QMessageBox::StandardButton::No); - - if (result == QMessageBox::StandardButton::No) - { - return false; - } - } - AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount); bool result = false; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index 5e1fbac282..0174871502 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -468,37 +468,6 @@ namespace MaterialEditor { return AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::MaterialSourceData::Extension); } - - AZStd::vector MaterialDocument::GetDataWarnings() const - { - AZStd::vector warnings; - - for (auto& [propertyName, dynamicProperty] : m_properties) - { - AZ::RPI::MaterialPropertyValue propertyValue = AtomToolsFramework::ConvertToRuntimeType(dynamicProperty.GetValue()); - if (propertyValue.Is>()) - { - auto isSameAsset = [&propertyValue](const char* path) - { - AZ::Data::AssetId assetId = propertyValue.GetValue>().GetId(); - AZ::Data::AssetId otherAssetId; - AZ::Data::AssetCatalogRequestBus::BroadcastResult(otherAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, path, AZ::Data::AssetType{}, false); - return assetId == otherAssetId; - }; - - if (isSameAsset(AZ::RPI::DefaultImageAssetPaths::DefaultFallback) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::Missing) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::Processing) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::ProcessingFailed) - ) - { - warnings.push_back(AZStd::string::format("%s is using a placeholder image asset.", propertyName.GetCStr())); - } - } - } - - return warnings; - } bool MaterialDocument::CanUndo() const { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h index d9f9dded0a..452111f99a 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h @@ -55,7 +55,6 @@ namespace MaterialEditor bool IsOpen() const override; bool IsModified() const override; bool IsSavable() const override; - AZStd::vector GetDataWarnings() const override; bool CanUndo() const override; bool CanRedo() const override; bool Undo() override;