Merge branch 'master' into test_resolve_conflicts

1 files changed, 4 insertions, 8 deletions

diff --git a/modules/txt2img.py b/modules/txt2img.py
index eedcdfe0..8f394d05 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -6,18 +6,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, scale_latent: bool, denoising_strength: float,

-            aesthetic_lr=0,

+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,aesthetic_lr=0,

             aesthetic_weight=0, aesthetic_steps=0,

             aesthetic_imgs=None,

             aesthetic_slerp=False,

             aesthetic_imgs_text="",

             aesthetic_slerp_angle=0.15,

-            aesthetic_text_negative=False,

-            *args):

+            aesthetic_text_negative=False, *args):

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -41,8 +36,9 @@ 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,

     )

 

     if cmd_opts.enable_console_prompts: