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

UE5/Release-Engine-Staging to UE5/Main

Browse Source 
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2021-01-08 19:56:07 -04:00
parent 85154a736f
commit bf80889353
677 changed files with 35835 additions and 9938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Editor/GraphEditor/Private/GraphActionNode.cpp
+1 -6
View File
@@ -573,7 +573,7 @@ void FGraphActionNode::InsertChild(TSharedPtr<FGraphActionNode> NodeToAdd)
NewSection->Children.Add(NodeToAdd);
if (NodeToAdd->IsCategoryNode())
{
CategoryNodes.Add(NodeToAdd->DisplayText.ToString(), NodeToAdd);
NewSection->CategoryNodes.Add(NodeToAdd->DisplayText.ToString(), NodeToAdd);
}
return;
}
@@ -613,8 +613,3 @@ void FGraphActionNode::InsertChild(TSharedPtr<FGraphActionNode> NodeToAdd)
}
}
Engine/Source/Editor/GraphEditor/Private/KismetPins/SGraphPinClass.cpp
+8 -15
View File
@@ -11,6 +11,7 @@
#include "ScopedTransaction.h"
#include "AssetRegistryModule.h"
#include "K2Node_Variable.h"
#include "K2Node_StructOperation.h"
#include "EdGraphSchema_K2.h"
#define LOCTEXT_NAMESPACE "SGraphPinClass"
@@ -21,7 +22,7 @@
void SGraphPinClass::Construct(const FArguments& InArgs, UEdGraphPin* InGraphPinObj)
{
SGraphPin::Construct(SGraphPin::FArguments(), InGraphPinObj);
bAllowAbstractClasses = false;
bAllowAbstractClasses = true;
}
FReply SGraphPinClass::OnClickUse()
@@ -104,21 +105,13 @@ TSharedRef<SWidget> SGraphPinClass::GenerateAssetPicker()
TSharedPtr<FGraphPinFilter> Filter = MakeShareable(new FGraphPinFilter);
Filter->bAllowAbstractClasses = bAllowAbstractClasses;
if (UK2Node_Variable* VarNode = Cast<UK2Node_Variable>(GraphPinObj->GetOwningNode()))
{
const FString* AllowAbstractString = VarNode->GetPropertyForVariable()->FindMetaData(FBlueprintMetadata::MD_AllowAbstractClasses);
Filter->bAllowAbstractClasses = AllowAbstractString && AllowAbstractString->ToBool();
}
else
{
// Check with the node to see if there is any "AllowAbstract" metadata for the pin
FString AllowAbstractString = GraphPinObj->GetOwningNode()->GetPinMetaData(GraphPinObj->PinName, FBlueprintMetadata::MD_AllowAbstractClasses);
// Check with the node to see if there is any "AllowAbstract" metadata for the pin
FString AllowAbstractString = GraphPinObj->GetOwningNode()->GetPinMetaData(GraphPinObj->PinName, FBlueprintMetadata::MD_AllowAbstractClasses);
// Override bAllowAbstractClasses is the AllowAbstract metadata was set
if (!AllowAbstractString.IsEmpty())
{
Filter->bAllowAbstractClasses = AllowAbstractString.ToBool();
}
// Override bAllowAbstractClasses is the AllowAbstract metadata was set
if (!AllowAbstractString.IsEmpty())
{
Filter->bAllowAbstractClasses = AllowAbstractString.ToBool();
}
Options.ClassFilter = Filter;