Merge remote-tracking branch 'mathewv/master'

This commit is contained in:
Vinyl Darkscratch 2016-12-29 13:56:20 -08:00
commit 641851db65

View file

@ -131,7 +131,7 @@ void vaoUnbind(VAO &vao)
}
}
#define HAVE_NATIVE_BLIT gl.BlitFramebuffer
#define HAVE_NATIVE_BLIT false //gl.BlitFramebuffer
static void _blitBegin(FBO::ID fbo, const Vec2i &size)
{