marc audy d760d54632 Merging using //Ocean/Dev-EngineMerge-To-//UE4/Main ...

#rb
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 5986648 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5999135 by marc audy in Dev-Anim branch]

2019-04-18 21:22:07 -04:00

..

Formatters

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313

2019-01-24 15:32:49 -05:00

ArchiveDescribeReference.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveDescribeReference.h

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveFindAllRefs.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveFindAllRefs.h

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveFindCulprit.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveHasReferences.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveObjectCrc32.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveObjectGraph.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveShowReferences.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveStackTrace.cpp

Fixing crashes in pkg info commandlet

2019-04-03 21:04:29 -04:00

ArchiveTraceRoute.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveUObject.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ArchiveUObjectFromStructuredArchive.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

AsyncLoading.cpp

Fixing issues with objects not being serialized before they are being ConditionallyPostLoaded by other objects and LoadContext related crashes

2019-03-15 05:40:49 -04:00

AsyncLoadingPrivate.h

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

AsyncLoadingThread.h

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791

2019-01-11 04:11:30 -05:00

BulkData.cpp

Merging using //Ocean/Dev-EngineMerge-To-//UE4/Main

2019-04-18 21:22:07 -04:00

DeferredMessageLog.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

DeferredMessageLog.h

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

DuplicateDataReader.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313

2019-01-24 15:32:49 -05:00

DuplicateDataWriter.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313

2019-01-24 15:32:49 -05:00

FindReferencersArchive.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ObjectReader.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

ObjectWriter.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

PropertyLocalizationDataGathering.cpp

Fixed containers failing to gather required instance overrides

2019-03-13 10:06:39 -04:00

TextReferenceCollector.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00

TraceReferences.cpp

Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671

2018-12-17 06:31:16 -05:00