From 439701ed7a55fe5ddfe996c8f397e88d54af2b36 Mon Sep 17 00:00:00 2001
From: paradust7 <102263465+paradust7@users.noreply.github.com>
Date: Sat, 16 Apr 2022 09:50:59 -0700
Subject: Fix '[combine' when EVDF_TEXTURE_NPOT is disabled. (#12187)

Stop scaling images to POT immediately when loaded. The 'combine'
modifier hardcodes X and Y coordinates, and so behaves incorrectly
if applied to a scaled image. Images emitted by generateImage()
are already scaled to POT before being used as a texture, so
nothing should break.
---
 src/client/tile.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/client/tile.cpp')

diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index da03ff5c8..aa78c50f0 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1109,9 +1109,6 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 	// Stuff starting with [ are special commands
 	if (part_of_name.empty() || part_of_name[0] != '[') {
 		video::IImage *image = m_sourcecache.getOrLoad(part_of_name);
-#if ENABLE_GLES
-		image = Align2Npot2(image, driver);
-#endif
 		if (image == NULL) {
 			if (!part_of_name.empty()) {
 
-- 
cgit v1.2.3