cherry-pick c0acbe7b

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-11-04 12:27:18 -05:00
parent 6ea951214c
commit fbebf04161
8 changed files with 86 additions and 76 deletions
@@ -29,7 +29,6 @@ namespace MaterialEditor
        : public AtomToolsFramework::AtomToolsDocument
        , public MaterialDocumentRequestBus::Handler
        , private AZ::TickBus::Handler
-        , private AZ::Data::AssetBus::MultiHandler
        , private AzToolsFramework::AssetSystemBus::Handler
    {
    public:
@@ -105,11 +104,6 @@ namespace MaterialEditor
        void SourceFileChanged(AZStd::string relativePath, AZStd::string scanFolder, AZ::Uuid sourceUUID) override;
        //////////////////////////////////////////////////////////////////////////

-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Data::AssetBus::Router overrides...
-        void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
-        //////////////////////////////////////////////////////////////////////////
-
        bool SavePropertiesToSourceData(
            const AZStd::string& exportPath, AZ::RPI::MaterialSourceData& sourceData, PropertyFilterFunction propertyFilter) const;

@@ -138,11 +132,8 @@ namespace MaterialEditor
        // Material instance being edited
        AZ::Data::Instance<AZ::RPI::Material> m_materialInstance;

-        // Asset used to open document
-        AZ::Data::AssetId m_sourceAssetId;
-
        // Set of assets that can trigger a document reload
-        AZStd::unordered_set<AZ::Data::AssetId> m_dependentAssetIds;
+        AZStd::unordered_set<AZStd::string> m_sourceDependencies;

        // Track if document saved itself last to skip external modification notification
        bool m_saveTriggeredInternally = false;