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

#fyi: Laurent.Delayen, James.Hopkin
#rb: none

[CL 4923303 by Lina Halper in Dev-Anim branch]
This commit is contained in:
Lina Halper
2019-02-06 14:35:56 -05:00
parent fdcba8f624
commit f7baa58bc9
18751 changed files with 2528866 additions and 561469 deletions

View File

@@ -58,7 +58,7 @@ namespace UnrealBuildTool.Rules
}
}
if (bHasVisualStudioDTE)
if (bHasVisualStudioDTE && Target.WindowsPlatform.StaticAnalyzer != WindowsStaticAnalyzer.PVSStudio)
{
PublicDefinitions.Add("VSACCESSOR_HAS_DTE=1");
}