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

#rb integration
#lockdown Nick.Whiting
#CodeReview: ryan.vance

[CL 6895021 by Jason Bestimt in Dev-VR branch]
This commit is contained in:
Jason Bestimt
2019-06-07 15:38:20 -04:00
parent 94448b241e
commit e2a78c5cdc
1418 changed files with 104671 additions and 32893 deletions

View File

@@ -19,8 +19,8 @@
[
{
"Name" : "PythonScriptPluginPreload",
"Type" : "Editor",
"LoadingPhase" : "PreDefault"
"Type" : "Runtime",
"LoadingPhase" : "EarliestPossible"
},
{
"Name" : "PythonScriptPlugin",
@@ -28,4 +28,4 @@
"LoadingPhase" : "PreDefault"
}
]
}
}