From f4a7a3694de989523db5fdec19012e8ec150a240 Mon Sep 17 00:00:00 2001 From: lauren barnes Date: Wed, 11 May 2022 16:35:41 -0400 Subject: [PATCH] Delaying CurveEditor command registration until PostEngineInit #rb trivial [FYI] Max.Chen #preflight 627ad8251e749933433e1e4d #ROBOMERGE-AUTHOR: lauren.barnes #ROBOMERGE-SOURCE: CL 20132075 via CL 20143953 via CL 20145123 via CL 20145967 #ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690) [CL 20149261 by lauren barnes in ue5-main branch] --- Engine/Source/Editor/CurveEditor/CurveEditor.Build.cs | 1 + .../Editor/CurveEditor/Private/CurveEditorModule.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Engine/Source/Editor/CurveEditor/CurveEditor.Build.cs b/Engine/Source/Editor/CurveEditor/CurveEditor.Build.cs index f7c9f63f62f0..f2f5c8b99215 100644 --- a/Engine/Source/Editor/CurveEditor/CurveEditor.Build.cs +++ b/Engine/Source/Editor/CurveEditor/CurveEditor.Build.cs @@ -20,6 +20,7 @@ public class CurveEditor : ModuleRules "TimeManagement", "UnrealEd", "SequencerWidgets", + "ToolMenus", } ); diff --git a/Engine/Source/Editor/CurveEditor/Private/CurveEditorModule.cpp b/Engine/Source/Editor/CurveEditor/Private/CurveEditorModule.cpp index 360161db070b..c82e24c3315f 100644 --- a/Engine/Source/Editor/CurveEditor/Private/CurveEditorModule.cpp +++ b/Engine/Source/Editor/CurveEditor/Private/CurveEditorModule.cpp @@ -6,6 +6,7 @@ #include "CurveEditor.h" #include "CurveEditorViewRegistry.h" #include "Framework/MultiBox/MultiBoxExtender.h" +#include "ToolMenus.h" class FCurveEditorModule : public ICurveEditorModule { @@ -14,7 +15,14 @@ public: { if (GIsEditor) { - FCurveEditorCommands::Register(); + if (UToolMenus::TryGet()) + { + FCurveEditorCommands::Register(); + } + else + { + FCoreDelegates::OnPostEngineInit.AddStatic(&FCurveEditorCommands::Register); + } } }