From f8ef47e2cf01e51ee9e415f15b9b2ae2a3f13b69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 18:22:33 +0900 Subject: [PATCH] add null check for DefaultRoot (#245) (#247) Co-authored-by: yuokamoto --- .../RapyutaSimulationPlugins/Private/Robots/RRBaseRobot.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/RapyutaSimulationPlugins/Private/Robots/RRBaseRobot.cpp b/Source/RapyutaSimulationPlugins/Private/Robots/RRBaseRobot.cpp index cb6e648e..cfcb42ec 100644 --- a/Source/RapyutaSimulationPlugins/Private/Robots/RRBaseRobot.cpp +++ b/Source/RapyutaSimulationPlugins/Private/Robots/RRBaseRobot.cpp @@ -216,6 +216,11 @@ void ARRBaseRobot::SetBaseMeshComp(UMeshComponent* InBaseMeshComp, bool bInMakeA DefaultRoot->DestroyComponent(); DefaultRoot = nullptr; } + else if (IsValid(DefaultRoot)) + { + // Cannot remove [DefaultRoot] in ctor thus to be done later in [PreInitializeComponents()] + DefaultRoot->AttachToComponent(InBaseMeshComp, FAttachmentTransformRules::KeepRelativeTransform); + } } }