Merge branch 'pr/387' into feature-5.3

getnamo · Sep 26, 2023 · 9268409 · 9268409
2 parents 8172999 + 94f343b
commit 9268409
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp
@@ -4,13 +4,13 @@
 #include "CUBlueprintLibrary.h"
 #include "IImageWrapper.h"
 #include "IImageWrapperModule.h"
-#include "Core/Public/Modules/ModuleManager.h"
-#include "Core/Public/Async/Async.h"
-#include "Engine/Classes/Engine/Texture2D.h"
-#include "Core/Public/HAL/ThreadSafeBool.h"
-#include "RHI/Public/RHI.h"
-#include "Core/Public/Misc/FileHelper.h"
-#include "Engine/Public/OpusAudioInfo.h"
+#include "Modules/ModuleManager.h"
+#include "Async/Async.h"
+#include "Engine/Texture2D.h"
+#include "HAL/ThreadSafeBool.h"
+#include "RHI.h"
+#include "Misc/FileHelper.h"
+#include "OpusAudioInfo.h"
 #include "Launch/Resources/Version.h"
 #include "Developer/TargetPlatform/Public/Interfaces/IAudioFormat.h"
 #include "CoreMinimal.h"
@@ -19,6 +19,10 @@
 #include "CUOpusCoder.h"
 #include "CUMeasureTimer.h"
 #include "Hash/CityHash.h"
+#include "RenderingThread.h"
+#include "TextureResource.h"
+#include "Audio.h"
+#include "Sound/SoundWaveProcedural.h"
 
 #pragma warning( push )
 #pragma warning( disable : 5046)

diff --git a/Source/CoreUtility/Public/CUBlueprintLibrary.h b/Source/CoreUtility/Public/CUBlueprintLibrary.h
@@ -5,7 +5,7 @@
 
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Async/Future.h"
-#include "Engine/Classes/Sound/SoundWaveProcedural.h"
+#include "Sound/SoundWaveProcedural.h"
 #include "CUBlueprintLibrary.generated.h"
 
 /** Wrapper for EImageFormat::Type for BP */

diff --git a/Source/CoreUtility/Public/CULambdaRunnable.h b/Source/CoreUtility/Public/CULambdaRunnable.h
@@ -2,7 +2,7 @@
 
 
 #pragma once
-#include "Engine/Classes/Engine/LatentActionManager.h"
+#include "Engine/LatentActionManager.h"
 #include "LatentActions.h"
 #include "Async/TaskGraphInterfaces.h"
 
@@ -69,4 +69,4 @@ class COREUTILITY_API FCULambdaRunnable
 	*	Due to context cost recommended for >0.1sec durations.
 	*/
 	static void SetTimeout(TFunction<void()>OnDone, float DurationInSec, bool bCallbackOnGameThread = true);
-};
+};
diff --git a/Source/SIOJEditorPlugin/Private/SIOJ_BreakJson.cpp b/Source/SIOJEditorPlugin/Private/SIOJ_BreakJson.cpp
@@ -16,7 +16,7 @@
 #include "BlueprintFieldNodeSpawner.h"
 #include "EditorCategoryUtils.h"
 #include "BlueprintActionFilter.h"
-#include "Launch/Resources/Version.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 #define LOCTEXT_NAMESPACE "SIOJ_BreakJson"
 

diff --git a/Source/SIOJson/Private/SIOJLibrary.cpp b/Source/SIOJson/Private/SIOJLibrary.cpp
@@ -5,8 +5,8 @@
 
 #include "SIOJLibrary.h"
 #include "ISIOJson.h"
-#include "Json/Public/Dom/JsonObject.h"
-#include "Json/Public/Dom/JsonValue.h"
+#include "Dom/JsonObject.h"
+#include "Dom/JsonValue.h"
 #include "SIOJsonValue.h"
 #include "SIOJsonObject.h"
 #include "Misc/Base64.h"