aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparadust7 <102263465+paradust7@users.noreply.github.com>2022-04-16 09:50:59 -0700
committersfan5 <sfan5@live.de>2022-05-14 18:33:42 +0200
commit439701ed7a55fe5ddfe996c8f397e88d54af2b36 (patch)
tree516fdc62a9f01425b446c88403f13e7ca6938c11
parentd945d0129c812084bc6db878c6ead76b1483fa3b (diff)
downloadminetest-439701ed7a55fe5ddfe996c8f397e88d54af2b36.tar.gz
minetest-439701ed7a55fe5ddfe996c8f397e88d54af2b36.tar.bz2
minetest-439701ed7a55fe5ddfe996c8f397e88d54af2b36.zip
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.
-rw-r--r--src/client/tile.cpp3
1 files changed, 0 insertions, 3 deletions
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()) {