From 1666603769cbb3a0a3b9e04530bb30b7ad5df16f Mon Sep 17 00:00:00 2001 From: Florian Weidner Date: Thu, 1 Mar 2018 09:56:55 +0100 Subject: [PATCH] Upgrade to 4.18.3 --- .../Source/MultiWindow/Private/MV_SpectatorWindowActor.cpp | 4 ++-- .../Source/MultiWindow/Public/MV_SpectatorWindowActor.h | 3 +++ SpectatorWindow.uproject | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Plugins/MultiWindow/Source/MultiWindow/Private/MV_SpectatorWindowActor.cpp b/Plugins/MultiWindow/Source/MultiWindow/Private/MV_SpectatorWindowActor.cpp index e51009a..e1ee004 100644 --- a/Plugins/MultiWindow/Source/MultiWindow/Private/MV_SpectatorWindowActor.cpp +++ b/Plugins/MultiWindow/Source/MultiWindow/Private/MV_SpectatorWindowActor.cpp @@ -311,8 +311,8 @@ void AMV_SpectatorWindowActor::OnSlateRendered(SWindow & SlateWindow, void * Vie GraphicsPSOInit.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*PixelShader); GraphicsPSOInit.PrimitiveType = PT_TriangleList; - //SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit); - RHICmdList.SetGraphicsPipelineState(GetAndOrCreateGraphicsPipelineState(RHICmdList, GraphicsPSOInit, EApplyRendertargetOption::CheckApply)); + SetGraphicsPipelineState(RHICmdList, GraphicsPSOInit); + //RHICmdList.SetGraphicsPipelineState(GetAndOrCreateGraphicsPipelineState(RHICmdList, GraphicsPSOInit, EApplyRendertargetOption::CheckApply)); PixelShader->SetParameters(RHICmdList, TStaticSamplerState::GetRHI(), ViewportBackBuffer); diff --git a/Plugins/MultiWindow/Source/MultiWindow/Public/MV_SpectatorWindowActor.h b/Plugins/MultiWindow/Source/MultiWindow/Public/MV_SpectatorWindowActor.h index 91907ed..fde844c 100644 --- a/Plugins/MultiWindow/Source/MultiWindow/Public/MV_SpectatorWindowActor.h +++ b/Plugins/MultiWindow/Source/MultiWindow/Public/MV_SpectatorWindowActor.h @@ -4,6 +4,9 @@ #include "CoreMinimal.h" #include "GameFramework/Actor.h" +#include "Runtime/RHI/Public/RHI.h" +#include "Runtime/SlateCore/Public/Widgets/SWindow.h" +#include "Runtime/Engine/Classes/Engine/Texture2D.h" #include "MV_SpectatorWindowActor.generated.h" class UTexture2D; diff --git a/SpectatorWindow.uproject b/SpectatorWindow.uproject index 513d03f..b0bed74 100644 --- a/SpectatorWindow.uproject +++ b/SpectatorWindow.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "4.17", + "EngineAssociation": "4.18", "Category": "", "Description": "", "Modules": [