Skip to content

Changed UPROPERTIES from raw pointers to TObjectPtr #4

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

Open
stormsc1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed UPROPERTIES from raw pointers to TObjectPtr #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Source/ThumbnailGenerator/Private/ThumbnailGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ UTexture2D* FThumbnailGenerator::CaptureThumbnail(const FThumbnailSettings& Thum

const static auto CalcActorLocalThumbnailBounds = [](AActor* InActor, const FThumbnailSettings& InThumbnailSettings, bool bDrawDebug)->FBox
{
const static TFunction<bool(UActorComponent*, const TSet<UClass*>&)> IsBlacklisted = [](UActorComponent* InComponent, const TSet<UClass*>& Blacklist)->bool
const static TFunction<bool(UActorComponent*, const TSet<TObjectPtr<UClass>>&)> IsBlacklisted = [](UActorComponent* InComponent, const TSet<TObjectPtr<UClass>>& Blacklist)->bool
{
for (UClass* BlacklistedClass : Blacklist)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/ThumbnailGenerator/Private/ThumbnailScene/ThumbnailBackgroundScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class UThumbnailBackgroundLevelStreamingFixer : public UObject
private:

UPROPERTY()
class ULevelStreaming* LevelStreaming;
TObjectPtr<class ULevelStreaming> LevelStreaming;

int32 InstanceID;

Expand Down
4 changes: 2 additions & 2 deletions Source/ThumbnailGenerator/Public/ThumbnailGeneratorSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ struct THUMBNAILGENERATOR_API FThumbnailSettings

// Components of this type will be ignored when calculating the actor bounding box for framing (Ignored when using custom camera transform)
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Thumbnail Actor", meta=(EditCondition = "bOverride_ComponentBoundsBlacklist"))
TSet<UClass*> ComponentBoundsBlacklist;
TSet<TObjectPtr<UClass>> ComponentBoundsBlacklist;

UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="Thumbnail Actor", meta=(EditCondition = "bOverride_bIncludeHiddenComponentsInBounds"))
bool bIncludeHiddenComponentsInBounds;
Expand Down Expand Up @@ -418,7 +418,7 @@ class THUMBNAILGENERATOR_API UThumbnailGeneratorSettings : public UObject
GENERATED_BODY()
private:
UPROPERTY()
TArray<UObject*> AssetRefs;
TArray<TObjectPtr<UObject>> AssetRefs;

public:

Expand Down