zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 00:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed crash in the precaching code.

Browse source 
This didn't detect software canvas textures and crashed on the missing image.
This commit is contained in:
Christoph Oelckers 2019-01-14 00:09:36 +01:00
parent 141d5bdf3e
commit 9b2c11a612
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/swrenderer/r_swrenderer.cpp
View file

@ -86,7 +86,7 @@ void FSoftwareRenderer::PreparePrecache(FTexture *ttex, int cache)
{ {
bool isbgra = V_IsTrueColor(); bool isbgra = V_IsTrueColor();
if (ttex != NULL && ttex->isValid()) if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
{ {
FSoftwareTexture *tex = ttex->GetSoftwareTexture(); FSoftwareTexture *tex = ttex->GetSoftwareTexture();
@ -105,7 +105,7 @@ void FSoftwareRenderer::PrecacheTexture(FTexture *ttex, int cache)
{ {
bool isbgra = V_IsTrueColor(); bool isbgra = V_IsTrueColor();
if (ttex != NULL && ttex->isValid()) if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
{ {
FSoftwareTexture *tex = ttex->GetSoftwareTexture(); FSoftwareTexture *tex = ttex->GetSoftwareTexture();
if (cache & FTextureManager::HIT_Columnmode) if (cache & FTextureManager::HIT_Columnmode)