Merge branch 'apng-opengl' into 'master'

opengl apng fix

See merge request STJr/SRB2!497
This commit is contained in:
Monster Iestyn 2019-06-14 13:29:13 -04:00
commit 96b12f098b

View file

@ -1032,7 +1032,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
static inline moviemode_t M_StartMovieAPNG(const char *pathname)
{
#ifdef USE_APNG
UINT8 *palette;
UINT8 *palette = NULL;
const char *freename = NULL;
boolean ret = false;
@ -1048,8 +1048,13 @@ static inline moviemode_t M_StartMovieAPNG(const char *pathname)
return MM_OFF;
}
if (rendermode == render_soft) M_CreateScreenShotPalette();
ret = M_SetupaPNG(va(pandf,pathname,freename), (palette = screenshot_palette));
if (rendermode == render_soft)
{
M_CreateScreenShotPalette();
palette = screenshot_palette;
}
ret = M_SetupaPNG(va(pandf,pathname,freename), palette);
if (!ret)
{