Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166

#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-08-11 01:36:57 -04:00
parent fa1f2339b5
commit a7c9001a94
5532 changed files with 991019 additions and 66660 deletions
@@ -13,6 +13,7 @@
#if WITH_EDITOR
#include "WorkspaceMenuStructure.h"
#include "WorkspaceMenuStructureModule.h"
#include "EditorStyleSet.h"
#endif //#if WITH_EDITOR
/**
@@ -173,7 +174,7 @@ public:
.SetDisplayName(NSLOCTEXT("ProfileVisualizerModule", "TabTitle", "Profile Data Visualizer"))
.SetTooltipText(NSLOCTEXT("ProfileVisualizerModule", "TooltipText", "Open the Profile Data Visualizer tab."))
.SetGroup(WorkspaceMenu::GetMenuStructure().GetDeveloperToolsDebugCategory())
;
.SetIcon(FSlateIcon(FEditorStyle::Get().GetStyleSetName(), "Profiler.Tab"));
#endif
}