UE4 - merge GDC branch, code @2465640 to main

[CL 2468685 by Gil Gribb in Main branch]
This commit is contained in:
Gil Gribb
2015-03-04 08:31:40 -05:00
parent ef2f14ce22
commit 35cf42566a
242 changed files with 6002 additions and 2652 deletions
@@ -6,6 +6,7 @@
#pragma once
#define PERF_TRACK_DETAILED_ASYNC_STATS (0)
/**
* Structure containing intermediate data required for async loading of all imports and exports of a
* ULinkerLoad.
@@ -203,11 +204,6 @@ public:
/** Total time spent in FinishObjects. */
double FinishObjectsTime;
/** Map of each class of object loaded to the total time spent calling CreateExport on those objects */
TMap<const UClass*,FMapTimeEntry> CreateExportTimePerClass;
/** Map of each class of object loaded to the total time spent calling PostLoad on those objects */
TMap<const UClass*,FMapTimeEntry> PostLoadTimePerClass;
#endif
private: