From edb97e03cd5257ac4a2f46c6773be9954d29191e Mon Sep 17 00:00:00 2001
From: Timon Roemer <t.roemer@vis.rwth-aachen.de>
Date: Wed, 8 May 2024 09:19:51 +0200
Subject: [PATCH] Resolve Merge Conflicts
---
.../Interactables/IntenSelect/IntenSelectable.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp
index f99b7d65..2daca7dc 100644
--- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp
+++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp
@@ -3,8 +3,6 @@
#include "Interaction/Interactables/IntenSelect/IntenSelectable.h"
#include "Interaction/Interactables/IntenSelect/IntenSelectableScoring.h"
#include "Interaction/Interactables/IntenSelect/IntenSelectableSinglePointScoring.h"
-#include "Kismet/KismetSystemLibrary.h"
-#include "Logging/StructuredLog.h"
#include "Misc/MessageDialog.h"
#include "Pawn/IntenSelectComponent.h"
#include "Utility/RWTHVRUtilities.h"
@@ -47,9 +45,9 @@ void UIntenSelectable::BeginPlay()
{
if (ScoringBehaviours.Num() == 0)
{
- UE_LOGFMT(
- Toolkit, Error,
- "Please assign the Scoring Behaviour manually when using more than one IntenSelectable Component!");
+ URWTHVRUtilities::ShowErrorAndQuit(
+ "Please assign the Scoring Behaviour manually when using more than one IntenSelectable Component!",
+ false, this);
}
}
else
--
GitLab