Merge branch 'master' into master

1 files changed, 9 insertions, 3 deletions

diff --git a/modules/txt2img.py b/modules/txt2img.py
index 5368e4d0..2381347f 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -6,7 +6,7 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html

 

 

-def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, scale_latent: bool, denoising_strength: float, *args):

+def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, firstphase_width: int, firstphase_height: int, *args):

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -30,11 +30,14 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
         restore_faces=restore_faces,

         tiling=tiling,

         enable_hr=enable_hr,

-        scale_latent=scale_latent if enable_hr else None,

         denoising_strength=denoising_strength if enable_hr else None,

+        firstphase_width=firstphase_width if enable_hr else None,

+        firstphase_height=firstphase_height if enable_hr else None,

     )

 

-    print(f"\ntxt2img: {prompt}", file=shared.progress_print_out)

+    if cmd_opts.enable_console_prompts:

+        print(f"\ntxt2img: {prompt}", file=shared.progress_print_out)

+

     processed = modules.scripts.scripts_txt2img.run(p, *args)

 

     if processed is None:

@@ -46,5 +49,8 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
     if opts.samples_log_stdout:

         print(generation_info_js)

 

+    if opts.do_not_show_images:

+        processed.images = []

+

     return processed.images, generation_info_js, plaintext_to_html(processed.info)