Skip to content

Commit 3983c1f

Browse files
committed
Compile fixes for UE5 production release
1 parent a956c23 commit 3983c1f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

BLUI.uplugin

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"FileVersion": 3,
33
"FriendlyName": "BLUI",
44
"Version": 3,
5-
"VersionName": "4.3.1",
5+
"VersionName": "4.4.0",
66
"Description": "Chromium Embedded Framework (CEF) powered HTML UI and HUD for Unreal Engine 4",
77
"Category": "UI",
88
"CreatedBy": "Aaron M. Shea, Getnamo, & Contributors",

Source/Blu/Private/BluEye.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void UBluEye::ResetTexture()
117117
Texture->AddToRoot();
118118
Texture->UpdateResource();
119119

120-
RenderParams.Texture2DResource = (FTexture2DResource*)Texture->Resource;
120+
RenderParams.Texture2DResource = (FTexture2DResource*)Texture->GetResource();
121121

122122
ResetMatInstance();
123123

@@ -131,13 +131,13 @@ void UBluEye::DestroyTexture()
131131
{
132132
Texture->RemoveFromRoot();
133133

134-
if (Texture->Resource)
134+
if (Texture->GetResource())
135135
{
136-
BeginReleaseResource(Texture->Resource);
136+
BeginReleaseResource(Texture->GetResource());
137137
FlushRenderingCommands();
138138
}
139139

140-
Texture->MarkPendingKill();
140+
Texture->MarkAsGarbage();
141141
Texture = nullptr;
142142
bValidTexture = false;
143143
}
@@ -161,7 +161,7 @@ void UBluEye::TextureUpdate(const void *buffer, FUpdateTextureRegion2D *updateRe
161161
}
162162

163163
FUpdateTextureRegionsData* RegionData = new FUpdateTextureRegionsData;
164-
RegionData->Texture2DResource = (FTextureResource*)Texture->Resource;
164+
RegionData->Texture2DResource = (FTextureResource*)Texture->GetResource();
165165
RegionData->NumRegions = regionCount;
166166
RegionData->SrcBpp = 4;
167167
RegionData->SrcPitch = int32(Settings.ViewSize.X) * 4;
@@ -627,7 +627,7 @@ void UBluEye::SpawnTickEventLoopIfNeeded()
627627
{
628628
if (!EventLoopData.DelegateHandle.IsValid())
629629
{
630-
EventLoopData.DelegateHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda([&](float DeltaTime)
630+
EventLoopData.DelegateHandle = FTSTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateLambda([&](float DeltaTime)
631631
{
632632
if (EventLoopData.bShouldTickEventLoop)
633633
{
@@ -719,8 +719,8 @@ void UBluEye::BeginDestroy()
719719
EventLoopData.EyeCount--;
720720
if (EventLoopData.EyeCount <= 0)
721721
{
722-
FTicker::GetCoreTicker().RemoveTicker(EventLoopData.DelegateHandle);
723-
EventLoopData.DelegateHandle = FDelegateHandle();
722+
FTSTicker::GetCoreTicker().RemoveTicker(EventLoopData.DelegateHandle);
723+
EventLoopData.DelegateHandle = FTSTicker::FDelegateHandle();
724724
}
725725
Super::BeginDestroy();
726726
}

Source/Blu/Public/BluTypes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
struct FTickEventLoopData
77
{
8-
FDelegateHandle DelegateHandle;
8+
FTSTicker::FDelegateHandle DelegateHandle;
99
int32 EyeCount;
1010
bool bShouldTickEventLoop;
1111

1212
FTickEventLoopData()
1313
{
14-
DelegateHandle = FDelegateHandle();
14+
DelegateHandle = FTSTicker::FDelegateHandle();
1515
EyeCount = 0;
1616
bShouldTickEventLoop = true;
1717
}

0 commit comments

Comments
 (0)