zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 15:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix colormap null pointer crash

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-12 03:25:27 +01:00
parent 9123c71bb6
commit 0ba8448782
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/v_draw.cpp
View file

@ -243,12 +243,8 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
drawerargs.SetTranslationMap(identitymap); drawerargs.SetTranslationMap(identitymap);
} }
bool visible;
FDynamicColormap *basecolormap = nullptr; FDynamicColormap *basecolormap = nullptr;
if (viewport->RenderTarget->IsBgra()) bool visible = drawerargs.SetStyle(parms.style, parms.Alpha, -1, parms.fillcolor, basecolormap);
visible = drawerargs.SetStyle(parms.style, parms.Alpha, -1, parms.fillcolor, basecolormap);
else
visible = drawerargs.SetStyle(parms.style, parms.Alpha, 0, parms.fillcolor, basecolormap);
double x0 = parms.x - parms.left * parms.destwidth / parms.texwidth; double x0 = parms.x - parms.left * parms.destwidth / parms.texwidth;
double y0 = parms.y - parms.top * parms.destheight / parms.texheight; double y0 = parms.y - parms.top * parms.destheight / parms.texheight;