diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-02-19 09:41:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-19 09:41:29 +0000 |
| commit | dfb3b8f398239876cdfc03657680e50c76a1fed8 (patch) | |
| tree | 30b5b4e5a179e9d88e75ac0abdcf0090e1c74397 /modules/ui.py | |
| parent | edb10092de516dda5271130ed53628387780a859 (diff) | |
| parent | 43137773227344dd79b56c227dbc9fb54ac7c337 (diff) | |
| download | stable-diffusion-webui-gfx803-dfb3b8f398239876cdfc03657680e50c76a1fed8.tar.gz stable-diffusion-webui-gfx803-dfb3b8f398239876cdfc03657680e50c76a1fed8.tar.bz2 stable-diffusion-webui-gfx803-dfb3b8f398239876cdfc03657680e50c76a1fed8.zip | |
Merge branch 'master' into weighted-learning
Diffstat (limited to 'modules/ui.py')
| -rw-r--r-- | modules/ui.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/ui.py b/modules/ui.py index efb87c23..0516c643 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -631,9 +631,9 @@ def create_ui(): (hr_resize_y, "Hires resize-2"),
*modules.scripts.scripts_txt2img.infotext_fields
]
- parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields)
+ parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields, override_settings)
parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(
- paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None, override_settings_component=override_settings,
+ paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None,
))
txt2img_preview_params = [
@@ -963,10 +963,10 @@ def create_ui(): (mask_blur, "Mask blur"),
*modules.scripts.scripts_img2img.infotext_fields
]
- parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields)
- parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields)
+ parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields, override_settings)
+ parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields, override_settings)
parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(
- paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None, override_settings_component=override_settings,
+ paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None,
))
modules.scripts.scripts_current = None
@@ -1786,7 +1786,7 @@ def versions_html(): return f"""
python: <span title="{sys.version}">{python_version}</span>
•
-torch: {torch.__version__}
+torch: {getattr(torch, '__long_version__',torch.__version__)}
•
xformers: {xformers_version}
•
|