Fixed up a couple incorrectly or incompletely resolved merge conflicts.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-11-16 10:35:49 -08:00
parent db3d41ad9d
commit 9f7815fa04
3 changed files with 4 additions and 2 deletions
@@ -49,6 +49,7 @@ namespace AtomToolsFramework
    //! @param propertyValue the value being converted before saving
    bool ConvertToExportFormat(
        const AZStd::string& exportPath,
+        [[maybe_unused]] const AZ::Name& propertyId,
        const AZ::RPI::MaterialTypeSourceData::PropertyDefinition& propertyDefinition,
        AZ::RPI::MaterialPropertyValue& propertyValue);