Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix UE 5.4 Compilation #19

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix UE 5.4 Compilation #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b36bdf
Fix UE 5.4 Errors. API Update
youseiy May 24, 2024
84c584b
Small fix
youseiy May 24, 2024
566937f
Revert "Small fix"
youseiy May 24, 2024
c78f0b5
Revert "Fix UE 5.4 Errors. API Update"
youseiy May 24, 2024
264e82b
API Update 5.4
youseiy May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Plugins/AnimatedTexturePlugin/Source/AnimatedTexture/Private/AnimatedTexture2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ float UAnimatedTexture2D::RenderFrameToTexture()

typedef TSharedPtr<FRenderCommandData, ESPMode::ThreadSafe> FCommandDataPtr;
FCommandDataPtr CommandData = MakeShared<FRenderCommandData, ESPMode::ThreadSafe>();
CommandData->RHIResource = Resource;
CommandData->RHIResource = GetResource();
CommandData->FrameBuffer = (const uint8*)(Decoder->GetFrameBuffer());

//-- equeue render command
Expand Down
6 changes: 3 additions & 3 deletions ...edTexturePlugin/Source/AnimatedTextureEditor/Private/AnimatedTextureThumbnailRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void UAnimatedTextureThumbnailRenderer::GetThumbnailSize(UObject* Object, float
void UAnimatedTextureThumbnailRenderer::Draw(UObject* Object, int32 X, int32 Y, uint32 Width, uint32 Height, FRenderTarget* Viewport, FCanvas* Canvas, bool bAdditionalViewFamily)
{
UAnimatedTexture2D* Texture = Cast<UAnimatedTexture2D>(Object);
if (Texture != nullptr && Texture->Resource != nullptr)
if (Texture != nullptr && Texture->GetResource() != nullptr)
{
if (Texture->SupportsTransparency)
{
Expand All @@ -45,11 +45,11 @@ void UAnimatedTextureThumbnailRenderer::Draw(UObject* Object, int32 X, int32 Y,
Canvas->DrawTile(
0.0f, 0.0f, Width, Height, // Dimensions
0.0f, 0.0f, CheckerDensity, CheckerDensity, // UVs
FLinearColor::White, Checker->Resource); // Tint & Texture
FLinearColor::White, Checker->GetResource()); // Tint & Texture
}

// Use A canvas tile item to draw
FCanvasTileItem CanvasTile(FVector2D(X, Y), Texture->Resource, FVector2D(Width, Height), FLinearColor::White);
FCanvasTileItem CanvasTile(FVector2D(X, Y), Texture->GetResource(), FVector2D(Width, Height), FLinearColor::White);
CanvasTile.BlendMode = Texture->SupportsTransparency ? SE_BLEND_Translucent : SE_BLEND_Opaque;
CanvasTile.Draw(Canvas);
}// end of if(texture is valid)
Expand Down
2 changes: 1 addition & 1 deletion Source/UAnimatedTexture5.Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class UAnimatedTexture5Target : TargetRules
public UAnimatedTexture5Target( TargetInfo Target) : base(Target)
{
Type = TargetType.Game;
DefaultBuildSettings = BuildSettingsVersion.V2;
DefaultBuildSettings = BuildSettingsVersion.Latest;
ExtraModuleNames.AddRange( new string[] { "AnimatedTextureDemo" } );
}
}
2 changes: 1 addition & 1 deletion Source/UAnimatedTexture5Editor.Target.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class UAnimatedTexture5EditorTarget : TargetRules
public UAnimatedTexture5EditorTarget( TargetInfo Target) : base(Target)
{
Type = TargetType.Editor;
DefaultBuildSettings = BuildSettingsVersion.V2;
DefaultBuildSettings = BuildSettingsVersion.Latest;
ExtraModuleNames.AddRange( new string[] { "AnimatedTextureDemo" } );
}
}