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

[unreal]Fix:增加对Class Metadata的修改检查来修复删除元数据不会被检测为更改而不重新编译的问题 #1733

Merged
merged 1 commit into from
May 24, 2024
Merged

[unreal]Fix:增加对Class Metadata的修改检查来修复删除元数据不会被检测为更改而不重新编译的问题 #1733

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
59 changes: 47 additions & 12 deletions unreal/Puerts/Source/PuertsEditor/Private/PEBlueprintMetaData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ bool UPEClassMetaData::Apply(UClass* InClass, UBlueprint* InBlueprint)
MergeClassCategories(InClass);
const bool bFlagsChanged = MergeAndValidateClassFlags(InClass);
const bool bMetaDataChanged = SetClassMetaData(InClass);
SyncClassToBlueprint(InClass, InBlueprint);
return bFlagsChanged || bMetaDataChanged;
const bool bBlueprintMetaDataChange = SyncClassToBlueprint(InClass, InBlueprint);
return bFlagsChanged || bMetaDataChanged || bBlueprintMetaDataChange;
}

void UPEClassMetaData::MergeClassCategories(UClass* InParentClass)
Expand Down Expand Up @@ -313,21 +313,56 @@ TArray<FString> UPEClassMetaData::GetClassMetaDataValues(
return Result;
}

void UPEClassMetaData::SyncClassToBlueprint(UClass* InClass, UBlueprint* InBlueprint)
bool UPEClassMetaData::SyncClassToBlueprint(UClass* InClass, UBlueprint* InBlueprint)
{
if (!IsValid(InClass) || !IsValid(InBlueprint))
{
return;
return false;
}

bool onChange = false;

if (InBlueprint->bDeprecate != (bool) (InClass->ClassFlags & CLASS_Deprecated))
{
InBlueprint->bDeprecate = (bool) (InClass->ClassFlags & CLASS_Deprecated);
onChange = true;
}
if (InBlueprint->bGenerateAbstractClass != (bool) (InClass->ClassFlags & CLASS_Abstract))
{
InBlueprint->bGenerateAbstractClass = (bool) (InClass->ClassFlags & CLASS_Abstract);
onChange = true;
}
FString newDescription = InClass->HasMetaData(TEXT("Tooltip")) ? InClass->GetMetaData(TEXT("Tooltip")) : FString{};
if (InBlueprint->BlueprintDescription != newDescription)
{
InBlueprint->BlueprintDescription = newDescription;
onChange = true;
}
FString newDisplayName = InClass->HasMetaData(TEXT("DisplayName")) ? InClass->GetMetaData(TEXT("DisplayName")) : FString{};
if (InBlueprint->BlueprintDisplayName != newDisplayName)
{
InBlueprint->BlueprintDisplayName = newDisplayName;
onChange = true;
}
EBlueprintType newType = (InClass->ClassFlags & CLASS_Const) ? BPTYPE_Const : BPTYPE_Normal;
if (InBlueprint->BlueprintType != newType)
{
InBlueprint->BlueprintType = newType;
onChange = true;
}
FString newCategory = InClass->HasMetaData(TEXT("Category")) ? InClass->GetMetaData(TEXT("Category")) : FString{};
if (InBlueprint->BlueprintCategory != newCategory)
{
InBlueprint->BlueprintCategory = newCategory;
onChange = true;
}
if (InBlueprint->HideCategories != HideCategories)
{
InBlueprint->HideCategories = HideCategories;
onChange = true;
}

InBlueprint->bDeprecate = (bool) (InClass->ClassFlags & CLASS_Deprecated);
InBlueprint->bGenerateAbstractClass = (bool) (InClass->ClassFlags & CLASS_Abstract);
InBlueprint->BlueprintDescription = InClass->HasMetaData(TEXT("Tooltip")) ? InClass->GetMetaData(TEXT("Tooltip")) : FString{};
InBlueprint->BlueprintDisplayName =
InClass->HasMetaData(TEXT("DisplayName")) ? InClass->GetMetaData(TEXT("DisplayName")) : FString{};
InBlueprint->BlueprintType = (InClass->ClassFlags & CLASS_Const) ? BPTYPE_Const : BPTYPE_Normal;
InBlueprint->BlueprintCategory = InClass->HasMetaData(TEXT("Category")) ? InClass->GetMetaData(TEXT("Category")) : FString{};
InBlueprint->HideCategories = HideCategories;
return onChange;
}

void UPEClassMetaData::SetAndValidateWithinClass(UClass* InClass)
Expand Down
2 changes: 1 addition & 1 deletion unreal/Puerts/Source/PuertsEditor/Public/PEBlueprintMetaData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ class PUERTSEDITOR_API UPEClassMetaData : public UObject
* @param InClass
* @param InBlueprint
*/
void SyncClassToBlueprint(UClass* InClass, UBlueprint* InBlueprint);
bool SyncClassToBlueprint(UClass* InClass, UBlueprint* InBlueprint);

private:
/**
Expand Down
Loading