Juan Canada c33df2efd0 Merging //UE4/Dev-Main@6856949 to Dev-Rendering (//UE4/Dev-Rendering) ...

#lockdown marcus.wassmer
#rb none

[CL 6863606 by Juan Canada in Dev-Rendering branch]

2019-06-06 13:30:16 -04:00

..

ExportMaterialProxy.h

DR - The issue is that GameThreadShaderMap and the RenderingThreadShaderMap can get out of sync. And one case of this is when DefaultMaterials are forced though the !bApplyCompletedShaderMapForRendering path because bSynchronousCompile is set. Although it is noted that "if !bApplyCompletedShaderMapForRendering, RenderingThreadShaderMap must be set elsewhere to match up with the new value of GameThreadShaderMap" the Result is actually a dangling reference of RenderingThreadShaderMap. Therefore I removed bApplyCompletedShaderMapForRendering and force the synchronization of the RenderingThreadShaderMap via the SetGameThreadShaderMap interface each and every time it is changed.

2019-05-30 11:56:02 -04:00

MaterialBakingHelpers.cpp

Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-28 21:04:21 -05:00

MaterialBakingModule.cpp

Merging //UE4/Dev-Main@6134169 to Dev-Rendering (//UE4/Dev-Rendering)

2019-04-29 11:59:36 -04:00

MaterialBakingModule.h

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

MaterialOptionsCustomization.cpp

Merging //UE4/Dev-Main@6856949 to Dev-Rendering (//UE4/Dev-Rendering)

2019-06-06 13:30:16 -04:00

MaterialOptionsCustomization.h

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

MaterialOptionsWindow.cpp

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

MaterialOptionsWindow.h

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

MaterialRenderItem.cpp

Renamed FDrawingPolicyRenderState -> FMeshPassProcessorRenderState

2019-01-16 16:09:39 -05:00

MaterialRenderItem.h

Renamed FDrawingPolicyRenderState -> FMeshPassProcessorRenderState

2019-01-16 16:09:39 -05:00

MaterialRenderItemData.cpp

Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)

2019-01-03 19:16:26 -05:00

MaterialRenderItemData.h

Fix triggered assert caused by nullptr in an auto test

2019-01-07 14:54:29 -05:00