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

#rb integration
#lockdown nick.whiting

[CL 6826047 by Ryan Vance in Dev-VR branch]
This commit is contained in:
Ryan Vance
2019-06-04 01:00:22 -04:00
parent 188d281bf4
commit bed32be158
4021 changed files with 130830 additions and 60165 deletions

View File

@@ -62,8 +62,8 @@ public:
* Use OffscreenCanvas Support (else use Offscreen Framebuffer)
* Note: Multithreading rendering option (WORK IN PROGRESS)
*/
// UPROPERTY(GlobalConfig, EditAnywhere, Category=Emscripten, Meta = (DisplayName = "Offscreen Canvas [experimental]"))
// bool OffscreenCanvas;
UPROPERTY(GlobalConfig, EditAnywhere, Category=Emscripten, Meta = (DisplayName = "Offscreen Canvas [experimental]"))
bool OffscreenCanvas;
/**
* Use LLVM WASM Backend (WORK IN PROGRESS)