Merge branch 'master' into joy2

This commit is contained in:
Eric Wasylishen 2016-02-26 12:32:15 -07:00
commit 2d7408f623

View file

@ -260,6 +260,9 @@ void R_UpdateWarpTextures (void)
tx->update_warp = false;
}
// ericw -- workaround for osx 10.6 driver bug when using FSAA. R_Clear only clears the warpimage part of the screen.
GL_SetCanvas(CANVAS_DEFAULT);
//if warp render went down into sbar territory, we need to be sure to refresh it next frame
if (gl_warpimagesize + sb_lines > glheight)
Sbar_Changed ();