From 0f0812c198b3e337d8976610281f6205cf00c65c Mon Sep 17 00:00:00 2001 From: AMZN-AlexOteiza Date: Fri, 10 Sep 2021 11:25:51 +0200 Subject: [PATCH] Reverted unintended change Signed-off-by: AMZN-AlexOteiza --- .../AzToolsFramework/Application/ToolsApplication.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp index 0a6022eeba..75d31321c2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp @@ -484,7 +484,7 @@ namespace AzToolsFramework EBUS_EVENT_RESULT(serializeContext, AZ::ComponentApplicationBus, GetSerializeContext); AZ_Assert(serializeContext, "No serialization context found"); - const AZ::Entity::ComponentArrayType& editorComponents = source.GetUserComponents(); + const AZ::Entity::ComponentArrayType& editorComponents = source.GetComponents(); // Propagate components from source entity to target, in preparation for exporting target. for (AZ::Component* component : editorComponents) @@ -494,15 +494,15 @@ namespace AzToolsFramework if (asEditorComponent) { - const size_t oldComponentCount = target.GetUserComponents().size(); + const size_t oldComponentCount = target.GetComponents().size(); asEditorComponent->BuildGameEntity(&target); // Applying same Id persistence trick as we do in the slice compiler. Once we're off levels, // this code all goes away and everything runs through the slice compiler. - if (target.GetUserComponents().size() > oldComponentCount) + if (target.GetComponents().size() > oldComponentCount) { - AZ::Component* newComponent = target.GetUserComponents().back(); + AZ::Component* newComponent = target.GetComponents().back(); AZ_Error("Export", asEditorComponent->GetId() != AZ::InvalidComponentId, "For entity \"%s\", component \"%s\" doesn't have a valid component id", source.GetName().c_str(), asEditorComponent->RTTI_GetType().ToString().c_str()); newComponent->SetId(asEditorComponent->GetId());