Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui into gamepad

1 files changed, 8 insertions, 5 deletions

diff --git a/modules/txt2img.py b/modules/txt2img.py
index c8f81176..e945fd69 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -8,13 +8,13 @@ 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, denoising_strength: float, firstphase_width: int, firstphase_height: int, *args):

+def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, 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, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, *args):

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

         outpath_grids=opts.outdir_grids or opts.outdir_txt2img_grids,

         prompt=prompt,

-        styles=[prompt_style, prompt_style2],

+        styles=prompt_styles,

         negative_prompt=negative_prompt,

         seed=seed,

         subseed=subseed,

@@ -33,8 +33,11 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
         tiling=tiling,

         enable_hr=enable_hr,

         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,

+        hr_scale=hr_scale,

+        hr_upscaler=hr_upscaler,

+        hr_second_pass_steps=hr_second_pass_steps,

+        hr_resize_x=hr_resize_x,

+        hr_resize_y=hr_resize_y,

     )

 

     p.scripts = modules.scripts.scripts_txt2img

@@ -59,4 +62,4 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
     if opts.do_not_show_images:

         processed.images = []

 

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

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