Merge branch 'main' into DetachPrefab

2021-06-01 11:12:52 -07:00
parent e8e9096dda ed55158b35
commit a9d030b454
1186 changed files with 22653 additions and 18613 deletions
@@ -95,7 +95,7 @@ namespace AzToolsFramework
            const AZStd::vector<AZ::Entity*>& entities, AZStd::vector<AZStd::unique_ptr<Instance>>&& instancesToConsume,
            AZ::IO::PathView filePath, AZStd::unique_ptr<AZ::Entity> containerEntity, bool shouldCreateLinks)
        {
-            AZ::IO::Path relativeFilePath = m_prefabLoader.GetRelativePathToProject(filePath);
+            AZ::IO::Path relativeFilePath = m_prefabLoader.GenerateRelativePath(filePath);
            if (GetTemplateIdFromFilePath(relativeFilePath) != InvalidTemplateId)
            {
                AZ_Error("Prefab", false,