diff --git a/src/g_strife/strife_sbar.cpp b/src/g_strife/strife_sbar.cpp
index bcdf624d7b..eb3fa26087 100644
--- a/src/g_strife/strife_sbar.cpp
+++ b/src/g_strife/strife_sbar.cpp
@@ -35,7 +35,6 @@ public:
 	const BYTE *GetColumn (unsigned int column, const Span **spans_out);
 	const BYTE *GetPixels ();
 	bool CheckModified ();
-	void Unload ();
 
 	void SetVial (int level);
 
@@ -90,10 +89,6 @@ bool FHealthBar::CheckModified ()
 	return NeedRefresh;
 }
 
-void FHealthBar::Unload ()
-{
-}
-
 const BYTE *FHealthBar::GetColumn (unsigned int column, const Span **spans_out)
 {
 	if (NeedRefresh)
diff --git a/src/menu/playerdisplay.cpp b/src/menu/playerdisplay.cpp
index c3d11a43a3..16671975a0 100644
--- a/src/menu/playerdisplay.cpp
+++ b/src/menu/playerdisplay.cpp
@@ -78,7 +78,6 @@ public:
 
 	const BYTE *GetColumn(unsigned int column, const Span **spans_out);
 	const BYTE *GetPixels();
-	void Unload();
 	bool CheckModified();
 
 protected:
@@ -212,10 +211,6 @@ bool FBackdropTexture::CheckModified()
 	return LastRenderTic != gametic;
 }
 
-void FBackdropTexture::Unload()
-{
-}
-
 //=============================================================================
 //
 //
diff --git a/src/r_swrenderer.cpp b/src/r_swrenderer.cpp
index 556323df52..5be41660e6 100644
--- a/src/r_swrenderer.cpp
+++ b/src/r_swrenderer.cpp
@@ -87,9 +87,9 @@ void FSoftwareRenderer::PrecacheTexture(FTexture *tex, int cache)
 		if (cache & FTextureManager::HIT_Columnmode)
 		{
 			const FTexture::Span *spanp;
-			/*if (r_swtruecolor)
+			if (r_swtruecolor)
 				tex->GetColumnBgra(0, &spanp);
-			else*/
+			else
 				tex->GetColumn(0, &spanp);
 		}
 		else if (cache != 0)
diff --git a/src/textures/automaptexture.cpp b/src/textures/automaptexture.cpp
index 67d68b9feb..9aac379ef1 100644
--- a/src/textures/automaptexture.cpp
+++ b/src/textures/automaptexture.cpp
@@ -122,6 +122,7 @@ void FAutomapTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/buildtexture.cpp b/src/textures/buildtexture.cpp
index bfcc6333d3..1155dacc4b 100644
--- a/src/textures/buildtexture.cpp
+++ b/src/textures/buildtexture.cpp
@@ -56,7 +56,6 @@ public:
 
 	const BYTE *GetColumn (unsigned int column, const Span **spans_out);
 	const BYTE *GetPixels ();
-	void Unload ();
 
 protected:
 	const BYTE *Pixels;
@@ -103,17 +102,6 @@ FBuildTexture::~FBuildTexture ()
 //
 //==========================================================================
 
-void FBuildTexture::Unload ()
-{
-	// Nothing to do, since the pixels are accessed from memory-mapped files directly
-}
-
-//==========================================================================
-//
-//
-//
-//==========================================================================
-
 const BYTE *FBuildTexture::GetPixels ()
 {
 	return Pixels;
diff --git a/src/textures/canvastexture.cpp b/src/textures/canvastexture.cpp
index a72546d781..109d927ab2 100644
--- a/src/textures/canvastexture.cpp
+++ b/src/textures/canvastexture.cpp
@@ -183,6 +183,8 @@ void FCanvasTexture::Unload ()
 		CanvasBgra->Destroy();
 		CanvasBgra = NULL;
 	}
+
+	FTexture::Unload();
 }
 
 bool FCanvasTexture::CheckModified ()
diff --git a/src/textures/ddstexture.cpp b/src/textures/ddstexture.cpp
index 31e7480221..fb4de34c57 100644
--- a/src/textures/ddstexture.cpp
+++ b/src/textures/ddstexture.cpp
@@ -401,6 +401,7 @@ void FDDSTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/flattexture.cpp b/src/textures/flattexture.cpp
index 840d53aaf1..08e0d1221e 100644
--- a/src/textures/flattexture.cpp
+++ b/src/textures/flattexture.cpp
@@ -138,6 +138,7 @@ void FFlatTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/imgztexture.cpp b/src/textures/imgztexture.cpp
index 1c262d7079..04932d4bf5 100644
--- a/src/textures/imgztexture.cpp
+++ b/src/textures/imgztexture.cpp
@@ -142,6 +142,7 @@ void FIMGZTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/jpegtexture.cpp b/src/textures/jpegtexture.cpp
index a37eff6c3d..3b53598460 100644
--- a/src/textures/jpegtexture.cpp
+++ b/src/textures/jpegtexture.cpp
@@ -196,7 +196,6 @@ public:
 protected:
 
 	BYTE *Pixels;
-	std::vector<uint32_t> PixelsBgra;
 	Span DummySpans[2];
 
 	void MakeTexture ();
@@ -300,7 +299,7 @@ void FJPEGTexture::Unload ()
 {
 	delete[] Pixels;
 	Pixels = NULL;
-	PixelsBgra.clear();
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp
index b0db481a89..6ae45c785d 100644
--- a/src/textures/multipatchtexture.cpp
+++ b/src/textures/multipatchtexture.cpp
@@ -362,6 +362,7 @@ void FMultiPatchTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/patchtexture.cpp b/src/textures/patchtexture.cpp
index 423ce4deb2..8388515c02 100644
--- a/src/textures/patchtexture.cpp
+++ b/src/textures/patchtexture.cpp
@@ -184,6 +184,7 @@ void FPatchTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/pcxtexture.cpp b/src/textures/pcxtexture.cpp
index 0ec5d2933c..42a13b85a9 100644
--- a/src/textures/pcxtexture.cpp
+++ b/src/textures/pcxtexture.cpp
@@ -191,6 +191,7 @@ void FPCXTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/pngtexture.cpp b/src/textures/pngtexture.cpp
index 95f7aca75f..206797a344 100644
--- a/src/textures/pngtexture.cpp
+++ b/src/textures/pngtexture.cpp
@@ -67,7 +67,6 @@ protected:
 
 	FString SourceFile;
 	BYTE *Pixels;
-	std::vector<uint32_t> PixelsBgra;
 	Span **Spans;
 
 	BYTE BitDepth;
@@ -382,7 +381,7 @@ void FPNGTexture::Unload ()
 {
 	delete[] Pixels;
 	Pixels = NULL;
-	PixelsBgra.clear();
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/rawpagetexture.cpp b/src/textures/rawpagetexture.cpp
index 1402f88442..69313fd1c2 100644
--- a/src/textures/rawpagetexture.cpp
+++ b/src/textures/rawpagetexture.cpp
@@ -206,6 +206,7 @@ void FRawPageTexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp
index 28a3b93338..0030719cbe 100644
--- a/src/textures/texture.cpp
+++ b/src/textures/texture.cpp
@@ -176,6 +176,11 @@ FTexture::~FTexture ()
 	KillNative();
 }
 
+void FTexture::Unload()
+{
+	PixelsBgra = std::vector<uint32_t>();
+}
+
 const uint32_t *FTexture::GetColumnBgra(unsigned int column, const Span **spans_out)
 {
 	const uint32_t *pixels = GetPixelsBgra();
@@ -189,16 +194,19 @@ const uint32_t *FTexture::GetColumnBgra(unsigned int column, const Span **spans_
 
 const uint32_t *FTexture::GetPixelsBgra()
 {
-	if (BgraPixels.empty())
+	if (PixelsBgra.empty())
 	{
+		GetColumn(0, nullptr);
 		const BYTE *indices = GetPixels();
-		BgraPixels.resize(Width * Height);
+		if (indices == nullptr)
+			return nullptr;
+		PixelsBgra.resize(Width * Height);
 		for (int i = 0; i < Width * Height; i++)
 		{
-			BgraPixels[i] = GPalette.BaseColors[indices[i]].d;
+			PixelsBgra[i] = GPalette.BaseColors[indices[i]].d;
 		}
 	}
-	return BgraPixels.data();
+	return PixelsBgra.data();
 }
 
 bool FTexture::CheckModified ()
@@ -642,10 +650,6 @@ FDummyTexture::FDummyTexture ()
 	UseType = TEX_Null;
 }
 
-void FDummyTexture::Unload ()
-{
-}
-
 void FDummyTexture::SetSize (int width, int height)
 {
 	Width = width;
diff --git a/src/textures/textures.h b/src/textures/textures.h
index 872c83b1a9..38d1ef487b 100644
--- a/src/textures/textures.h
+++ b/src/textures/textures.h
@@ -192,7 +192,7 @@ public:
 	virtual FTexture *GetRedirect(bool wantwarped);
 	virtual FTexture *GetRawTexture();		// for FMultiPatchTexture to override
 
-	virtual void Unload () = 0;
+	virtual void Unload ();
 
 	// Returns the native pixel format for this image
 	virtual FTextureFormat GetFormat();
@@ -269,8 +269,7 @@ protected:
 		Rotations = other->Rotations;
 	}
 
-private:
-	std::vector<uint32_t> BgraPixels;
+	std::vector<uint32_t> PixelsBgra;
 
 public:
 	static void FlipSquareBlock (BYTE *block, int x, int y);
@@ -472,7 +471,6 @@ public:
 	FDummyTexture ();
 	const BYTE *GetColumn (unsigned int column, const Span **spans_out);
 	const BYTE *GetPixels ();
-	void Unload ();
 	void SetSize (int width, int height);
 };
 
diff --git a/src/textures/tgatexture.cpp b/src/textures/tgatexture.cpp
index b208a51a37..5e76a63b2d 100644
--- a/src/textures/tgatexture.cpp
+++ b/src/textures/tgatexture.cpp
@@ -181,6 +181,7 @@ void FTGATexture::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/textures/warptexture.cpp b/src/textures/warptexture.cpp
index a8a2ddb9e1..b6977dd77e 100644
--- a/src/textures/warptexture.cpp
+++ b/src/textures/warptexture.cpp
@@ -74,6 +74,7 @@ void FWarpTexture::Unload ()
 		Spans = NULL;
 	}
 	SourcePic->Unload ();
+	FTexture::Unload();
 }
 
 bool FWarpTexture::CheckModified ()
diff --git a/src/v_draw.cpp b/src/v_draw.cpp
index d03853c117..02ba591b6e 100644
--- a/src/v_draw.cpp
+++ b/src/v_draw.cpp
@@ -1403,7 +1403,7 @@ void DCanvas::FillSimplePoly(FTexture *tex, FVector2 *points, int npoints,
 		R_SetSpanColormap(colormap, clamp(shade >> FRACBITS, 0, NUMCOLORMAPS - 1));
 	else
 		R_SetSpanColormap(&identitycolormap, 0);
-	R_SetSpanSource(tex->GetPixels());
+	R_SetSpanSource(r_swtruecolor ? (const BYTE*)tex->GetPixelsBgra() : tex->GetPixels());
 	scalex = double(1u << (32 - ds_xbits)) / scalex;
 	scaley = double(1u << (32 - ds_ybits)) / scaley;
 	ds_xstep = xs_RoundToInt(cosrot * scalex);
diff --git a/src/v_font.cpp b/src/v_font.cpp
index 052074d11e..ef9b69dd12 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -1662,6 +1662,7 @@ void FFontChar1::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
@@ -1723,6 +1724,7 @@ void FFontChar2::Unload ()
 		delete[] Pixels;
 		Pixels = NULL;
 	}
+	FTexture::Unload();
 }
 
 //==========================================================================
diff --git a/src/v_video.cpp b/src/v_video.cpp
index e586381211..2cf04a29d2 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -117,7 +117,6 @@ public:
 
 	const BYTE *GetColumn(unsigned int column, const Span **spans_out);
 	const BYTE *GetPixels();
-	void Unload();
 	bool CheckModified();
 	void SetTranslation(int num);
 
@@ -1076,16 +1075,6 @@ void FPaletteTester::SetTranslation(int num)
 	}
 }
 
-//==========================================================================
-//
-// FPaletteTester :: Unload
-//
-//==========================================================================
-
-void FPaletteTester::Unload()
-{
-}
-
 //==========================================================================
 //
 // FPaletteTester :: GetColumn