diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-17 08:59:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 08:59:50 +0100 |
| commit | 99d0df2e33af09655d92bed0d619b6a8f93183ae (patch) | |
| tree | 0bdd376f362e316eea9ff8e46879181da3ead3a4 /modules/etc/image_etc.cpp | |
| parent | 93103693180c37afc349c2f410b3abb2ae62a549 (diff) | |
| parent | 02161aad5aa1355e977ea7df225aef53dab2f5bb (diff) | |
Merge pull request #38812 from aaronfranke/brace-no-empty-line
Remove all empty lines from the start of blocks defined with braces
Diffstat (limited to 'modules/etc/image_etc.cpp')
| -rw-r--r-- | modules/etc/image_etc.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index 6cac2458f9..4e9e64c6a7 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -106,7 +106,6 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f // If VRAM compression is using ETC, but image has alpha, convert to RGBA4444 or LA8 // This saves space while maintaining the alpha channel if (detected_channels == Image::USED_CHANNELS_RGBA) { - if (p_img->has_mipmaps()) { // Image doesn't support mipmaps with RGBA4444 textures p_img->clear_mipmaps(); @@ -114,7 +113,6 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f p_img->convert(Image::FORMAT_RGBA4444); return; } else if (detected_channels == Image::USE_CHANNELS_LA) { - p_img->convert(Image::FORMAT_LA8); return; } |