Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)

#rb none
#rnx

[CL 6620114 by Ben Marsh in Dev-Build branch]
This commit is contained in:
Ben Marsh
2019-05-23 13:55:56 -04:00
parent b58fc13ce8
commit 5f3ac5bc9e
453 changed files with 20699 additions and 6222 deletions

View File

@@ -49,12 +49,25 @@ FLinearColor UAnimGraphNode_Root::GetNodeTitleColor() const
FText UAnimGraphNode_Root::GetNodeTitle(ENodeTitleType::Type TitleType) const
{
return LOCTEXT("AnimGraphNodeRoot_Title", "Final Animation Pose");
FText DefaultTitle = LOCTEXT("AnimGraphNodeRoot_Title", "Output Pose");
if(TitleType != ENodeTitleType::FullTitle)
{
return DefaultTitle;
}
else
{
FFormatNamedArguments Args;
Args.Add(TEXT("NodeTitle"), DefaultTitle);
Args.Add(TEXT("Name"), FText::FromString(GetOuter()->GetName()));
return FText::Format(LOCTEXT("AnimGraphNodeRoot_TitleNamed", "{NodeTitle}\n{Name}"), Args);
}
}
FText UAnimGraphNode_Root::GetTooltipText() const
{
return LOCTEXT("AnimGraphNodeRoot_Tooltip", "Wire the final animation pose into this node");
return LOCTEXT("AnimGraphNodeRoot_Tooltip", "Wire the final animation pose for this graph into this node");
}
bool UAnimGraphNode_Root::IsSinkNode() const