alexis matte 84e8043d9d Force automation process to not use the ddc when executing merge actor test for staticmesh ...

#rb jurre.debaare
#jira UE-72667

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: alexis.matte
#ROBOMERGE-SOURCE: CL 6476239 via CL 6476594 via CL 6476626
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6517286 by alexis matte in Dev-VR branch]

2019-05-15 16:43:48 -04:00

..

MeshMergeDataTracker.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MeshMergeEditorExtensions.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MeshMergeEditorExtensions.h

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MeshMergeHelpers.cpp

Tentative, fix crash when generating HLOD with impostor

2019-05-07 17:33:25 -04:00

MeshMergeHelpers.h

Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 4803512

2019-01-24 15:35:51 -05:00

MeshMergeModule.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

MeshMergeUtilities.cpp

Force automation process to not use the ddc when executing merge actor test for staticmesh

2019-05-15 16:43:48 -04:00

MeshMergeUtilities.h

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

ProxyGenerationProcessor.cpp

HLOD with imposter section not assign to the correct material ID, and the proxy material is added for each imposter section.

2019-05-07 17:30:34 -04:00

ProxyGenerationProcessor.h

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

ProxyMaterialUtilities.h

Z-fighting is observed throughout the map while skydiving from Battle bus in BR

2019-04-24 15:38:14 -04:00

SkeletalMeshAdapter.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

StaticMeshAdapter.cpp

Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)

2019-01-17 18:54:05 -05:00

StaticMeshComponentAdapter.cpp

Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)

2019-01-30 21:24:04 -05:00