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
@@ -759,7 +759,7 @@ namespace MaterialEditor
            }
            
            auto parentMaterialAssetResult = parentMaterialSourceData.CreateMaterialAssetFromSourceData(
-                parentMaterialAssetIdResult.GetValue(), parentMaterialFilePath, true, true);
+                parentMaterialAssetIdResult.GetValue(), m_materialSourceData.m_parentMaterial, true, true);
            if (!parentMaterialAssetResult)
            {
                AZ_Error("MaterialDocument", false, "Material parent asset could not be created from source data: '%s'.", m_materialSourceData.m_parentMaterial.c_str());