From 7c5e2d5020b31a81eab46320714594ea6221dd1f Mon Sep 17 00:00:00 2001 From: William Emfinger Date: Thu, 10 Dec 2020 07:39:57 -0600 Subject: [PATCH] Updated 4.26 changes to be backwards compatible for 4.25 as well. --- Source/CoreUtility/Private/CUBlueprintLibrary.cpp | 6 +++--- Source/SIOJson/Public/SIOJRequestJSON.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp index 49c0982d..d2bf0ebf 100644 --- a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp +++ b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp @@ -81,7 +81,7 @@ UTexture2D* UCUBlueprintLibrary::Conv_BytesToTexture(const TArray& InByte [UpdateData](FRHICommandList& CommandList) { RHIUpdateTexture2D( - ((FTextureResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), + ((FTextureResource*)UpdateData->Texture2D->Resource)->TextureRHI->GetTexture2D(), 0, UpdateData->Region, UpdateData->Pitch, @@ -369,7 +369,7 @@ TFuture UCUBlueprintLibrary::Conv_BytesToTexture_Async(const TArray [UpdateData](FRHICommandList& CommandList) { RHIUpdateTexture2D( - ((FTextureResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), + ((FTextureResource*)UpdateData->Texture2D->Resource)->TextureRHI->GetTexture2D(), 0, UpdateData->Region, UpdateData->Pitch, @@ -552,4 +552,4 @@ void UCUBlueprintLibrary::CallFunctionOnThreadGraphReturn(const FString& Functio } } -#pragma warning( pop ) \ No newline at end of file +#pragma warning( pop ) diff --git a/Source/SIOJson/Public/SIOJRequestJSON.h b/Source/SIOJson/Public/SIOJRequestJSON.h index 6149fcf0..fb56a138 100644 --- a/Source/SIOJson/Public/SIOJRequestJSON.h +++ b/Source/SIOJson/Public/SIOJRequestJSON.h @@ -311,6 +311,6 @@ class SIOJSON_API USIOJRequestJSON : public UObject FString CustomVerb; /** Request we're currently processing */ - TSharedRef HttpRequest = FHttpModule::Get().CreateRequest(); + FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest(); };