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
This commit is contained in:
Rémi Verschelde 2018-10-06 23:09:06 +02:00 committed by GitHub
commit aad70d5ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -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();
}
}