izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors with Visual Studio 2019.

Browse Source 
#rb none
#jira UE-75931

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6911124 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking) (v366-6836689)

[CL 6922995 by ben marsh in Dev-Networking branch]
This commit is contained in:
ben marsh
2019-06-10 19:53:04 -04:00
parent 789b81afbc
commit 8156535f7d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformCompilerPreSetup.h
View File

@@ -97,6 +97,7 @@
__pragma(warning(push)) \
__pragma(warning(disable: 4510)) /* '<class>': default constructor could not be generated. */ \
__pragma(warning(disable: 4610)) /* object '<class>' can never be instantiated - user-defined constructor required. */ \
__pragma(warning(disable: 4800)) /* Implicit conversion from '<type>' to bool. Possible information loss. */ \
__pragma(warning(disable: 4946)) /* reinterpret_cast used between related classes: '<class1>' and '<class1>' */ \
__pragma(warning(disable: 4996)) /* '<obj>' was declared deprecated. */ \
__pragma(warning(disable: 6011)) /* Dereferencing NULL pointer '<ptr>'. */ \

2
Engine/Source/Runtime/Experimental/GeometryCollectionEngine/Private/GeometryCollection/GeometryCollectionSceneProxy.cpp
View File

@@ -417,7 +417,7 @@ void FGeometryCollectionSceneProxy::SetDynamicData_RenderThread(FGeometryCollect
if (bSupportsManualVertexFetch)
{
const bool bLocalGeometryCollectionTripleBufferUploads = GGeometryCollectionTripleBufferUploads;
const bool bLocalGeometryCollectionTripleBufferUploads = (GGeometryCollectionTripleBufferUploads != 0);
if (bLocalGeometryCollectionTripleBufferUploads && TransformBuffers.Num() == 1)
{