Skip to content

Commit

Permalink
Fix '[combine' when EVDF_TEXTURE_NPOT is disabled. (minetest#12187)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
paradust7 committed Apr 16, 2022
1 parent 062dd8d commit 7cea688
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/client/tile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {

Expand Down

0 comments on commit 7cea688

Please sign in to comment.