Merge remote-tracking branch 'origin/master' into vulkan2

This commit is contained in:
Magnus Norddahl 2019-04-19 18:49:00 +02:00
commit 62fa74485d
88 changed files with 3785 additions and 3443 deletions

View file

@ -82,7 +82,6 @@ OpenGLFrameBuffer::OpenGLFrameBuffer(void *hMonitor, bool fullscreen) :
gl_RenderState.Reset();
GLRenderer = nullptr;
InitPalette();
}
OpenGLFrameBuffer::~OpenGLFrameBuffer()