Skip to content

Commit

Permalink
Merge pull request #37 from mgaffe/Adaptive-Unity-Compilation-Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpas authored Jan 23, 2025
2 parents 5cd01f7 + 536ff1f commit 2f81668
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Source/ImGui/Private/TextureManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <Framework/Application/SlateApplication.h>

#include <algorithm>
#include "RHITypes.h"


void FTextureManager::InitializeErrorTexture(const FColor& Color)
Expand Down Expand Up @@ -160,6 +161,11 @@ const FSlateResourceHandle& FTextureManager::FTextureEntry::GetResourceHandle()
return CachedResourceHandle;
}

UTexture* FTextureManager::FTextureEntry::GetTexture() const
{
return Cast<UTexture>(Brush.GetResourceObject());
}

void FTextureManager::FTextureEntry::Reset(bool bReleaseResources)
{
if (bReleaseResources)
Expand Down
2 changes: 1 addition & 1 deletion Source/ImGui/Private/TextureManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class FTextureManager

const FName& GetName() const { return Name; }
const FSlateResourceHandle& GetResourceHandle() const;
UTexture* GetTexture() const { return Cast<UTexture>(Brush.GetResourceObject()); }
UTexture* GetTexture() const;

private:

Expand Down
1 change: 1 addition & 0 deletions Source/ImGui/Private/Widgets/SImGuiWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "ImGuiModuleManager.h"
#include "ImGuiModuleSettings.h"
#include "TextureManager.h"
#include "UnrealClient.h"
#include "Utilities/Arrays.h"
#include "VersionCompatibility.h"

Expand Down
1 change: 1 addition & 0 deletions Source/ImGui/Public/ImGuiModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <Modules/ModuleManager.h>

class UTexture;

class FImGuiModule : public IModuleInterface
{
Expand Down

0 comments on commit 2f81668

Please sign in to comment.