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

#rb none

[CL 5225772 by Chris Gagnon in Dev-Editor branch]
This commit is contained in:
Chris Gagnon
2019-02-27 11:02:17 -05:00
parent 5620411e41
commit 42c199aeb6
297 changed files with 4798 additions and 2236 deletions
@@ -75,10 +75,10 @@ FText FShaderFormatsPropertyDetails::GetFriendlyNameFromRHINameMac(const FString
FriendlyRHIName = LOCTEXT("MetalMRTTV", "tvOS Metal Desktop Renderer (SM5, Metal 1.2+, tvOS 10.0 or later)");
break;
case SP_METAL_SM5_NOTESS:
FriendlyRHIName = LOCTEXT("MetalSM5_NOTESS", "Mac Metal Desktop Renderer without Tessellation (SM5, Metal 1.2+, macOS Sierra 10.12.6 or later)");
FriendlyRHIName = LOCTEXT("MetalSM5_NOTESS", "Mac Metal Desktop Renderer without Tessellation (SM5, Metal 2.0+, macOS High Sierra 10.13.6 or later)");
break;
case SP_METAL_SM5:
FriendlyRHIName = LOCTEXT("MetalSM5", "Mac Metal Desktop Renderer with Tessellation (SM5, Metal 1.2+, macOS Sierra 10.12.6 or later)");
FriendlyRHIName = LOCTEXT("MetalSM5", "Mac Metal Desktop Renderer with Tessellation (SM5, Metal 2.0+, macOS High Sierra 10.13.6 or later)");
break;
case SP_METAL_MACES3_1:
FriendlyRHIName = LOCTEXT("MetalES3.1", "Mac Metal High-End Mobile Preview (ES3.1)");