Merge branch 'feature/toolkit_examples' of...

Merge branch 'feature/toolkit_examples' of https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/plugins/rwth-vr-toolkit into feature/toolkit_examples

Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp

@@ -93,7 +93,7 @@ void ARWTHVRPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputComponen
 {
 	Super::SetupPlayerInputComponent(PlayerInputComponent);
 
-	ThisPlayerInputComponent = PlayerInputComponent;
+	ActivePlayerInputComponent = PlayerInputComponent;
 
 	APlayerController* PlayerController = Cast<APlayerController>(GetController());
 	if (!PlayerController)
@@ -147,7 +147,7 @@ void ARWTHVRPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputComponen
 	}
 }
 
-UInputComponent* ARWTHVRPawn::GetPlayerInputComponent() { return ThisPlayerInputComponent; }
+UInputComponent* ARWTHVRPawn::GetPlayerInputComponent() { return ActivePlayerInputComponent; }
 
 
 void ARWTHVRPawn::AddInputMappingContext(const APlayerController* PC, const UInputMappingContext* Context) const

Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h

@@ -114,5 +114,5 @@ protected:
 	void SetupMotionControllerSources();
 
 private:
-	UInputComponent* ThisPlayerInputComponent;
+	UInputComponent* ActivePlayerInputComponent;
 };