- fixed crash in the precaching code.

This didn't detect software canvas textures and crashed on the missing image.
ZDoom · Jan 13, 2019 · dd5addd · dd5addd
1 parent bd964d4
commit dd5addd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/swrenderer/r_swrenderer.cpp b/src/swrenderer/r_swrenderer.cpp
@@ -86,7 +86,7 @@ void FSoftwareRenderer::PreparePrecache(FTexture *ttex, int cache)
 {
 	bool isbgra = V_IsTrueColor();
 
-	if (ttex != NULL && ttex->isValid())
+	if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
 	{
 		FSoftwareTexture *tex = ttex->GetSoftwareTexture();
 
@@ -105,7 +105,7 @@ void FSoftwareRenderer::PrecacheTexture(FTexture *ttex, int cache)
 {
 	bool isbgra = V_IsTrueColor();
 
-	if (ttex != NULL && ttex->isValid())
+	if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
 	{
 		FSoftwareTexture *tex = ttex->GetSoftwareTexture();
 		if (cache & FTextureManager::HIT_Columnmode)