Copying //UE4/Dev-Core to Dev-Main (//UE4/Dev-Main)

#rb none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: stefan.boberg
#ROBOMERGE-SOURCE: CL 6815521 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6821478 by stefan boberg in Dev-Anim branch]
This commit is contained in:
stefan boberg
2019-06-03 19:17:40 -04:00
parent 7740cd138b
commit 7f1f94b842
674 changed files with 49529 additions and 4825 deletions

View File

@@ -640,7 +640,7 @@ TSharedPtr<SWidget> SPoseViewer::OnGetContextMenuContentForCurveList() const
MenuBuilder.BeginSection("CurveAction", LOCTEXT("CurveActions", "Selected Item Actions"));
{
FUIAction Action = FUIAction(FExecuteAction::CreateSP(this, &SPoseViewer::OnDeleteCurves),
FUIAction Action = FUIAction(FExecuteAction::CreateSP(const_cast<SPoseViewer*>(this), &SPoseViewer::OnDeleteCurves),
FCanExecuteAction::CreateSP(this, &SPoseViewer::IsCurveSelected));
const FText MenuLabel = LOCTEXT("DeleteCurveButtonLabel", "Delete");
const FText MenuToolTip = LOCTEXT("DeleteCurveButtonTooltip", "Deletes the selected animation curve.");