Merge branch 'feature/nonNDisplayfix' into 'master'

Ready for UE 4.25 // DisplayCluster is not necessary

See merge request VR-Group/unreal-development/universallogging!5

Source/UniversalLogging/Private/LogStream.cpp

@@ -4,8 +4,8 @@
 #include "UniversalLogging.h"
 
 #include "HAL/PlatformFilemanager.h"
-#include "Paths.h"
-#include "IPlatformFileProfilerWrapper.h"
+#include "Misc/Paths.h"
+#include "HAL/IPlatformFileProfilerWrapper.h"
 
 LogStreamImpl::LogStreamImpl(const FString Filepath, const FString Filename, const bool bPer_Session, const bool bLogOnMaster, const bool bLogOnSlaves)
   : Filepath(Filepath)

Source/UniversalLogging/Private/LogStream.h

 #pragma once
-#include "Color.h"
+#include "Math/Color.h"
 
 class LogStreamImpl : public ILogStream
 {

Source/UniversalLogging/Private/OnScreenLog.h

@@ -5,8 +5,8 @@
 #include "CoreMinimal.h"
 #include "Engine/Font.h"
 #include "GameFramework/Actor.h"
-#include "ConstructorHelpers.h"
-#include "Queue.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Containers/Queue.h"
 #include "OnScreenLog.generated.h"
 
 UCLASS()

Source/UniversalLogging/Private/UniversalLogging.cpp

+#include "UniversalLogging.h"
+
 #include "UniversalLoggingPrivatePCH.h"
 
-#include "UniversalLogging.h"
 
 #include "LogStream.h"
 #include "GameFramework/PlayerController.h"
@@ -149,6 +150,10 @@ void UniversalLoggingImpl::ResetSessionId(FString Prefix)
 
 bool UniversalLoggingImpl::IsClusterMaster()
 {
+  if (!IDisplayCluster::IsAvailable()) 
+  {
+     return true;
+  }
   IDisplayClusterClusterManager* Manager = IDisplayCluster::Get().GetClusterMgr();
   if (Manager == nullptr)
   {

Source/UniversalLogging/Public/IUniversalLogging.h

 #pragma once
 
-#include "ModuleManager.h"
+#include "IDisplayCluster.h"
+#include "Modules/ModuleManager.h"
 
 #include "ILogStream.h"