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

Merge UE4/Main to Dev-Framework @ 7329145

Browse Source 
#rb
#rnx

[CL 7415594 by Marc Audy in Dev-Framework branch]
This commit is contained in:
Marc Audy
2019-07-17 12:57:46 -04:00
parent 9396844ccc 710d7cac57
commit f3f7604cd4
4117 changed files with 366569 additions and 802441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Editor/BlueprintGraph/Private/BlueprintActionDatabase.cpp
+3 -2
View File
@@ -857,13 +857,15 @@ static void BlueprintActionDatabaseImpl::GetNodeSpecificActions(TSubclassOf<UEdG
check(NodeCDO != nullptr);
NodeCDO->GetMenuActions(Registrar);
}
// unfortunately, UEdGraphNode_Comment is not a UK2Node and therefore cannot
// leverage UK2Node's GetMenuActions() function, so here we HACK it in
//
// @TODO: DO NOT follow this example! Do as I say, not as I do! If we need
// to support other nodes in a similar way, then we should come up
// with a better (more generalized) solution.
else if (NodeClass == UEdGraphNode_Comment::StaticClass())
if (NodeClass == UEdGraphNode_Comment::StaticClass())
{
Registrar.AddBlueprintAction(MakeCommentNodeSpawner());
}
@@ -1054,7 +1056,6 @@ static bool BlueprintActionDatabaseImpl::IsObjectValidForDatabase(UObject const*
******************************************************************************/
static FBlueprintActionDatabase* DatabaseInst = nullptr;
//------------------------------------------------------------------------------
FBlueprintActionDatabase& FBlueprintActionDatabase::Get()
{