Merge branch 'master' into improved-hr-conflict-test

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/txt2img.py b/modules/txt2img.py
index c06f9f9d..a938eaaa 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -1,5 +1,6 @@
 import modules.scripts

 from modules import sd_samplers

+from modules.generation_parameters_copypaste import create_override_settings_dict

 from modules.processing import StableDiffusionProcessing, Processed, StableDiffusionProcessingTxt2Img, \

     StableDiffusionProcessingImg2Img, process_images

 from modules.shared import opts, cmd_opts

@@ -8,7 +9,9 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html

 

 

-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, hr_sampler_index: int, hr_prompt: str, hr_negative_prompt, *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, hr_sampler_index: int, hr_prompt: str, hr_negative_prompt, override_settings_texts, *args):

+    override_settings = create_override_settings_dict(override_settings_texts)

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -40,7 +43,8 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
         hr_resize_y=hr_resize_y,

         hr_sampler=sd_samplers.samplers_for_img2img[hr_sampler_index - 1].name if hr_sampler_index != 0 else '---',

         hr_prompt=hr_prompt,

-        hr_negative_prompt=hr_negative_prompt

+        hr_negative_prompt=hr_negative_prompt,

+        override_settings=override_settings,

     )

 

     p.scripts = modules.scripts.scripts_txt2img