OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into vulkan2

Browse source 
# Conflicts:
#	src/posix/cocoa/i_video.mm
This commit is contained in:
alexey.lysiuk 2019-03-09 16:45:49 +02:00
commit 02ed758447
31 changed files with 123 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -418,12 +418,12 @@ void VulkanFrameBuffer::DrawScene(HWDrawInfo *di, int drawmode)
if (vp.camera != nullptr)
{
ActorRenderFlags savedflags = vp.camera->renderflags;
di->CreateScene();
di->CreateScene(drawmode == DM_MAINVIEW);
vp.camera->renderflags = savedflags;
}
else
{
di->CreateScene();
di->CreateScene(false);
}
GetRenderState()->SetDepthMask(true);