Merge pull request getnamo#248 from finger563/master

Updated 4.26 changes to be backwards compatible for 4.25 as well.
nsynkde · Dec 10, 2020 · c428381 · c428381
2 parents f7ccd3c + 7c5e2d5
commit c428381
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp
@@ -81,7 +81,7 @@ UTexture2D* UCUBlueprintLibrary::Conv_BytesToTexture(const TArray<uint8>& 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<UTexture2D*> 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 )
+#pragma warning( pop )
diff --git 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<IHttpRequest, ESPMode::ThreadSafe> HttpRequest = FHttpModule::Get().CreateRequest();
+	FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest();
 
 };