diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-06 23:09:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 23:09:06 +0200 |
| commit | aad70d5ebededd9d8d678bf6d50d946d2b11ce72 (patch) | |
| tree | 2fbb7e318ebf2046567de950d7b9edcdbe9f9c63 /core/image.cpp | |
| parent | ffe94ef4e2dc28e69337f53f58d0fa60e23607a8 (diff) | |
| parent | 6a37f15e5a502152fcc9bc2389f944bf552ad618 (diff) | |
Merge pull request #22804 from akien-mga/works-better-with-a-bug
Readd mipmaps 'bug' in Image::expand_x2_hq2x, fixing it caused a regression
Diffstat (limited to 'core/image.cpp')
| -rw-r--r-- | core/image.cpp | 4 |
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(); } } |