izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issues with duplicating Blueprints, removed UK2Node_Variable::PostDuplicate and moved logic to happen during the Blueprint's PostDuplicate.

Browse Source 
#ttp 349451 - CRITICAL: Regression: BP: Some blueprints will give a "Target must have a connection error when duplicated.
#ttp 348325 - Duplicating a blueprint leaves all (self) references pointing at the original

[CL 2327686 by Michael Schoell in Main branch]
This commit is contained in:
Michael Schoell
2014-10-13 17:03:32 -04:00
committed by UnrealBot
parent 548da9d74a
commit eba4f3ca99
3 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Source/Editor/BlueprintGraph/Classes/K2Node_Variable.h
View File

@@ -45,7 +45,6 @@ protected:
public:
// Begin UObject interface
virtual void PostDuplicate(bool bDuplicateForPIE) override;
virtual void Serialize(FArchive& Ar) override;
// End UObject interface

28
Engine/Source/Editor/BlueprintGraph/Private/K2Node_Variable.cpp
View File

@@ -322,34 +322,6 @@ UEdGraphPin* UK2Node_Variable::GetValuePin() const
return Pin;
}
void UK2Node_Variable::PostDuplicate(bool bDuplicateForPIE)
{
Super::PostDuplicate(bDuplicateForPIE);
if (!bDuplicateForPIE && (!this->HasAnyFlags(RF_Transient)))
{
// Self context variable nodes need to be updated with the new Blueprint class
if(VariableReference.IsSelfContext())
{
const UEdGraphSchema_K2* K2Schema = GetDefault<UEdGraphSchema_K2>();
if(UEdGraphPin* SelfPin = K2Schema->FindSelfPin(*this, EGPD_Input))
{
UClass* TargetClass = nullptr;
if(UProperty* Property = VariableReference.ResolveMember<UProperty>(this))
{
TargetClass = Property->GetOwnerClass()->GetAuthoritativeClass();
}
else
{
TargetClass = GetBlueprint()->SkeletonGeneratedClass->GetAuthoritativeClass();
}
SelfPin->PinType.PinSubCategoryObject = TargetClass;
}
}
}
}
void UK2Node_Variable::ValidateNodeDuringCompilation(class FCompilerResultsLog& MessageLog) const
{
Super::ValidateNodeDuringCompilation(MessageLog);

26
Engine/Source/Editor/UnrealEd/Private/Kismet2/BlueprintEditorUtils.cpp
View File

@@ -1488,6 +1488,32 @@ void FBlueprintEditorUtils::PostDuplicateBlueprint(UBlueprint* Blueprint)
for(auto& Node : AllGraphNodes)
{
Node->CreateNewGuid();
// Some variable nodes must be fixed up on duplicate, this cannot wait for individual
// node calls to PostDuplicate because it happens after compilation and will still result in errors
if(UK2Node_Variable* VariableNode = Cast<UK2Node_Variable>(Node))
{
// Self context variable nodes need to be updated with the new Blueprint class
if(VariableNode->VariableReference.IsSelfContext())
{
const UEdGraphSchema_K2* K2Schema = GetDefault<UEdGraphSchema_K2>();
if(UEdGraphPin* SelfPin = K2Schema->FindSelfPin(*VariableNode, EGPD_Input))
{
UClass* TargetClass = nullptr;
if(UProperty* Property = VariableNode->VariableReference.ResolveMember<UProperty>(VariableNode))
{
TargetClass = Property->GetOwnerClass()->GetAuthoritativeClass();
}
else
{
TargetClass = Blueprint->SkeletonGeneratedClass->GetAuthoritativeClass();
}
SelfPin->PinType.PinSubCategoryObject = TargetClass;
}
}
}
}
// And compile again to make sure they go into the generated class, get cleaned up, etc...