Merge from Release-Engine-Staging @ 16444985

This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
This commit is contained in:
Marc Audy
2021-05-25 02:43:26 -04:00
parent 92f981c30d
commit e80ea6b959
7081 changed files with 975696 additions and 52686 deletions
@@ -34,7 +34,7 @@ enum class ETimedDataMonitorEvaluationState : uint8
};
USTRUCT(meta = (DisplayName = "TimedSourcesConnectionEvent"))
struct FTimedDataMonitorChannelConnectionStateEvent : public FStageProviderMessage
struct FTimedDataMonitorChannelConnectionStateEvent : public FStageProviderEventMessage
{
GENERATED_BODY()
@@ -62,7 +62,7 @@ public:
};
USTRUCT(meta = (DisplayName = "TimedSourcesEvaluationEvent"))
struct FTimedDataMonitorChannelEvaluationStateEvent : public FStageProviderMessage
struct FTimedDataMonitorChannelEvaluationStateEvent : public FStageProviderEventMessage
{
GENERATED_BODY()