diff options
| author | Dynamic <bradje@naver.com> | 2022-10-23 13:36:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-23 13:36:56 +0000 |
| commit | 660ae690bd7107b78aac6413e1370f8cd72676bc (patch) | |
| tree | b666cfd0872687ccd293a41d9d0a90fcdfe1ea0a /modules/txt2img.py | |
| parent | 21364c5c39b269497944b56dd6664792d779333b (diff) | |
| parent | 6bd6154a92eb05c80d66df661a38f8b70cc13729 (diff) | |
| download | stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.tar.gz stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.tar.bz2 stable-diffusion-webui-gfx803-660ae690bd7107b78aac6413e1370f8cd72676bc.zip | |
Merge branch 'AUTOMATIC1111:master' into kr-localization
Diffstat (limited to 'modules/txt2img.py')
| -rw-r--r-- | modules/txt2img.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/txt2img.py b/modules/txt2img.py index 2381347f..c9d5a090 100644 --- a/modules/txt2img.py +++ b/modules/txt2img.py @@ -1,5 +1,6 @@ import modules.scripts
-from modules.processing import StableDiffusionProcessing, Processed, StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images
+from modules.processing import StableDiffusionProcessing, Processed, StableDiffusionProcessingTxt2Img, \
+ StableDiffusionProcessingImg2Img, process_images
from modules.shared import opts, cmd_opts
import modules.shared as shared
import modules.processing as processing
@@ -35,6 +36,9 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: firstphase_height=firstphase_height if enable_hr else None,
)
+ p.scripts = modules.scripts.scripts_txt2img
+ p.script_args = args
+
if cmd_opts.enable_console_prompts:
print(f"\ntxt2img: {prompt}", file=shared.progress_print_out)
@@ -53,4 +57,3 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: processed.images = []
return processed.images, generation_info_js, plaintext_to_html(processed.info)
-
|