Skip to content

Commit

Permalink
Updated 4.26 changes to be backwards compatible for 4.25 as well.
Browse files Browse the repository at this point in the history
  • Loading branch information
finger563 committed Dec 10, 2020
1 parent f7ccd3c commit 7c5e2d5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Source/CoreUtility/Private/CUBlueprintLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -552,4 +552,4 @@ void UCUBlueprintLibrary::CallFunctionOnThreadGraphReturn(const FString& Functio
}
}

#pragma warning( pop )
#pragma warning( pop )
2 changes: 1 addition & 1 deletion Source/SIOJson/Public/SIOJRequestJSON.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

};

0 comments on commit 7c5e2d5

Please sign in to comment.