alexis matte a07870bbfe #CodeReview: alexis.matte,cristina.riveron,nick.bullard,nick.penwarden ...

Merge conflict.
alexis.matte, please merge this change by hand.
More info at https://robomerge.epicgames.net#RELEASE

/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_1_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_2_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json - merging //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.json#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png - vs //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/22c96594569807222f8f1a0ad282ed19.png#3
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.json#2
Delete resolve:
at: delete
ay: ignore
/src/ROBOMERGE_RELEASE_Main/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png - resolving delete from //UE4/Release-4.22/EngineTest/Test/Screenshots/ActorMerging/ActorMerging_SimpleMeshMerge_LOD_3_None/Windows/D3D11_SM5/3fcc508dbd2d03ed4ef4a56e129b984a.png#2
Delete resolve:
at: delete
ay: ignore


--------------------------------------
Revert a material fix done for UE-67819, this change broke old assets.
#jira UE-69652
#rb none

#ROBOMERGE-SOURCE: CL 4951688 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4953006 by alexis matte in Main branch]

2019-02-08 17:32:01 -05:00

..

MeshDescriptionOperations.cpp

#CodeReview: alexis.matte,cristina.riveron,nick.bullard,nick.penwarden

2019-02-08 17:32:01 -05:00