Skip to content
Snippets Groups Projects
Commit edb97e03 authored by Timon Römer's avatar Timon Römer
Browse files

Resolve Merge Conflicts

parent 7baa5054
No related branches found
No related tags found
1 merge request!88Merges IntenSelect 5.3 into dev 5.3
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#include "Interaction/Interactables/IntenSelect/IntenSelectable.h" #include "Interaction/Interactables/IntenSelect/IntenSelectable.h"
#include "Interaction/Interactables/IntenSelect/IntenSelectableScoring.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableScoring.h"
#include "Interaction/Interactables/IntenSelect/IntenSelectableSinglePointScoring.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableSinglePointScoring.h"
#include "Kismet/KismetSystemLibrary.h"
#include "Logging/StructuredLog.h"
#include "Misc/MessageDialog.h" #include "Misc/MessageDialog.h"
#include "Pawn/IntenSelectComponent.h" #include "Pawn/IntenSelectComponent.h"
#include "Utility/RWTHVRUtilities.h" #include "Utility/RWTHVRUtilities.h"
...@@ -47,9 +45,9 @@ void UIntenSelectable::BeginPlay() ...@@ -47,9 +45,9 @@ void UIntenSelectable::BeginPlay()
{ {
if (ScoringBehaviours.Num() == 0) if (ScoringBehaviours.Num() == 0)
{ {
UE_LOGFMT( URWTHVRUtilities::ShowErrorAndQuit(
Toolkit, Error, "Please assign the Scoring Behaviour manually when using more than one IntenSelectable Component!",
"Please assign the Scoring Behaviour manually when using more than one IntenSelectable Component!"); false, this);
} }
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment