From f7ccd3ce154932e5f74ad7f8933fd862f50a3f41 Mon Sep 17 00:00:00 2001 From: getnamo Date: Sat, 3 Oct 2020 17:54:25 -0700 Subject: [PATCH] 4.26 - preliminary fixes --- SocketIOClient.uplugin | 4 ++-- Source/CoreUtility/Private/CUBlueprintLibrary.cpp | 4 ++-- Source/SIOJson/Public/SIOJRequestJSON.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin index 99e7e506..56378882 100644 --- a/SocketIOClient.uplugin +++ b/SocketIOClient.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "Version": 1, - "VersionName": "1.4.2", - "EngineVersion" : "4.25.0", + "VersionName": "1.4.3", + "EngineVersion" : "4.26.0", "FriendlyName": "Socket.IO Client", "Description": "Real-time networking library Socket.IO Client usable from blueprints and c++.", "Category": "Networking", diff --git a/Source/CoreUtility/Private/CUBlueprintLibrary.cpp b/Source/CoreUtility/Private/CUBlueprintLibrary.cpp index 5d17edd4..49c0982d 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( - ((FTexture2DResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), + ((FTextureResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), 0, UpdateData->Region, UpdateData->Pitch, @@ -369,7 +369,7 @@ TFuture UCUBlueprintLibrary::Conv_BytesToTexture_Async(const TArray [UpdateData](FRHICommandList& CommandList) { RHIUpdateTexture2D( - ((FTexture2DResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), + ((FTextureResource*)UpdateData->Texture2D->Resource)->GetTexture2DRHI(), 0, UpdateData->Region, UpdateData->Pitch, diff --git a/Source/SIOJson/Public/SIOJRequestJSON.h b/Source/SIOJson/Public/SIOJRequestJSON.h index 059de5d9..6149fcf0 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(); + TSharedRef HttpRequest = FHttpModule::Get().CreateRequest(); };