martin ridgers 231920f0f8 Fixed merge errors when Dev-RenPlatStage copied up to Main. ...

#rb cm
#jira none
#rnx

(ushell-p4-cherrypick of 9631298 by Martin.Ridgers)
(ushell-p4-cherrypick of 9631305 by Martin.Ridgers)
(ushell-p4-cherrypick of 9631347 by Martin.Ridgers)

#ROBOMERGE-SOURCE: CL 9676333 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v536-9675740)

[CL 9676335 by martin ridgers in Main branch]

2019-10-18 04:56:34 -04:00

..

ABTesting.h

…

CookStats.h

…

CountersTrace.h

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

2019-10-03 16:26:48 -04:00

CpuProfilerTrace.h

Fixed merge errors when Dev-RenPlatStage copied up to Main.

2019-10-18 04:56:34 -04:00

CsvProfiler.h

Add a CSV_PROFILER_USE_CUSTOM_FRAME_TIMINGS preprocesser macro to allow a game to call FCsvProfiler::BeginFrame and EndFrame instead of using the engine defaults.

2019-10-07 09:59:03 -04:00

CsvProfilerTrace.h

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

2019-10-03 16:26:48 -04:00

DebuggingDefines.h

…

DiagnosticTable.h

Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.

2019-09-28 08:19:35 -04:00

ExternalProfiler.h

Add delegate in the csv for start / End capture.

2019-09-17 21:22:54 -04:00

FormatArgsTrace.h

Fixed crash in LogTrace with nullptr string arguments

2019-09-27 11:28:41 -04:00

Histogram.h

Added FHistogram::DumpToJsonString2, which uses a slightly easier to query string format.

2019-04-23 13:02:15 -04:00

InstanceCounter.h

…

LoadTimeTracker.h

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

2019-06-03 15:32:00 -04:00

MallocProfiler.h

Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.

2019-09-28 08:19:35 -04:00

MiscTrace.h

Fixed merge errors when Dev-RenPlatStage copied up to Main.

2019-10-18 04:56:34 -04:00

PlatformFileTrace.h

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

2019-10-03 16:26:48 -04:00

ProfilingHelpers.h

…

ResourceSize.h

…

ScopedDebugInfo.h

…

ScopedTimers.h

Rearranged members to hopefully work around issue which I could not repro (could be that some #include site has a custom pragma pack leak)

2019-10-04 11:43:10 -04:00

UMemoryDefines.h

…