diff options
| author | InvincibleDude <81354513+InvincibleDude@users.noreply.github.com> | 2023-03-14 13:55:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 13:55:59 +0000 |
| commit | f5e44364535ccc7efef445dacb6395c3942f2f17 (patch) | |
| tree | ca7384e6225fccdae1e89db1e0ccc44dd60c7311 /modules/modelloader.py | |
| parent | f6e27378404631d951656388fc178b784fe1495b (diff) | |
| parent | a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 (diff) | |
| download | stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.gz stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.bz2 stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.zip | |
Merge branch 'master' into improved-hr-conflict-test
Diffstat (limited to 'modules/modelloader.py')
| -rw-r--r-- | modules/modelloader.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/modelloader.py b/modules/modelloader.py index fc3f6249..e351d808 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -6,7 +6,7 @@ from urllib.parse import urlparse from basicsr.utils.download_util import load_file_from_url from modules import shared -from modules.upscaler import Upscaler +from modules.upscaler import Upscaler, UpscalerLanczos, UpscalerNearest, UpscalerNone from modules.paths import script_path, models_path @@ -169,4 +169,8 @@ def load_upscalers(): scaler = cls(commandline_options.get(cmd_name, None)) datas += scaler.scalers - shared.sd_upscalers = datas + shared.sd_upscalers = sorted( + datas, + # Special case for UpscalerNone keeps it at the beginning of the list. + key=lambda x: x.name.lower() if not isinstance(x.scaler, (UpscalerNone, UpscalerLanczos, UpscalerNearest)) else "" + ) |