summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-10-06 17:34:59 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-10-06 17:34:59 +0200
commit6a37f15e5a502152fcc9bc2389f944bf552ad618 (patch)
tree2fbb7e318ebf2046567de950d7b9edcdbe9f9c63
parentffe94ef4e2dc28e69337f53f58d0fa60e23607a8 (diff)
Readd mipmaps 'bug' in Image::expand_x2_hq2x, fixing it caused a regression
Fixes #22747.
-rw-r--r--core/image.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/image.cpp b/core/image.cpp
index e2b56c51dc..3d85bdd345 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -1198,7 +1198,9 @@ void Image::expand_x2_hq2x() {
if (current != FORMAT_RGBA8)
convert(current);
- if (used_mipmaps) {
+ // FIXME: This is likely meant to use "used_mipmaps" as defined above, but if we do,
+ // we end up with a regression: GH-22747
+ if (mipmaps) {
generate_mipmaps();
}
}