happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correctly initialize inpaint_mask var, rename task styles index

This commit is contained in:
Manuel Schmid 2024-06-18 22:38:36 +02:00
parent dd866616bc
commit 6cb0b2143b
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/async_worker.py
View File

@ -693,10 +693,10 @@ def worker():
task_styles = async_task.style_selections.copy() task_styles = async_task.style_selections.copy()
if use_style: if use_style:
for i, s in enumerate(task_styles): for j, s in enumerate(task_styles):
if s == random_style_name: if s == random_style_name:
s = get_random_style(task_rng) s = get_random_style(task_rng)
task_styles[i] = s task_styles[j] = s
p, n = apply_style(s, positive=task_prompt) p, n = apply_style(s, positive=task_prompt)
positive_basic_workloads = positive_basic_workloads + p positive_basic_workloads = positive_basic_workloads + p
negative_basic_workloads = negative_basic_workloads + n negative_basic_workloads = negative_basic_workloads + n
@ -847,9 +847,9 @@ def worker():
return current_progress return current_progress
def apply_image_input(async_task, base_model_additional_loras, clip_vision_path, controlnet_canny_path, def apply_image_input(async_task, base_model_additional_loras, clip_vision_path, controlnet_canny_path,
controlnet_cpds_path, goals, inpaint_head_model_path, inpaint_mask, inpaint_parameterized, controlnet_cpds_path, goals, inpaint_head_model_path, inpaint_image, inpaint_mask,
ip_adapter_face_path, ip_adapter_path, ip_negative_path, skip_prompt_processing, inpaint_parameterized, ip_adapter_face_path, ip_adapter_path, ip_negative_path,
use_synthetic_refiner): skip_prompt_processing, use_synthetic_refiner):
if (async_task.current_tab == 'uov' or ( if (async_task.current_tab == 'uov' or (
async_task.current_tab == 'ip' and async_task.mixing_image_prompt_and_vary_upscale)) \ async_task.current_tab == 'ip' and async_task.mixing_image_prompt_and_vary_upscale)) \
and async_task.uov_method != flags.disabled and async_task.uov_input_image is not None: and async_task.uov_method != flags.disabled and async_task.uov_input_image is not None:
@ -1024,9 +1024,8 @@ def worker():
if async_task.input_image_checkbox: if async_task.input_image_checkbox:
base_model_additional_loras, clip_vision_path, controlnet_canny_path, controlnet_cpds_path, inpaint_head_model_path, inpaint_image, inpaint_mask, ip_adapter_face_path, ip_adapter_path, ip_negative_path, skip_prompt_processing, use_synthetic_refiner = apply_image_input( base_model_additional_loras, clip_vision_path, controlnet_canny_path, controlnet_cpds_path, inpaint_head_model_path, inpaint_image, inpaint_mask, ip_adapter_face_path, ip_adapter_path, ip_negative_path, skip_prompt_processing, use_synthetic_refiner = apply_image_input(
async_task, base_model_additional_loras, clip_vision_path, controlnet_canny_path, controlnet_cpds_path, async_task, base_model_additional_loras, clip_vision_path, controlnet_canny_path, controlnet_cpds_path,
goals, inpaint_head_model_path, inpaint_mask, inpaint_parameterized, ip_adapter_face_path, ip_adapter_path, goals, inpaint_head_model_path, inpaint_image, inpaint_mask, inpaint_parameterized, ip_adapter_face_path,
ip_negative_path, skip_prompt_processing, use_synthetic_refiner) ip_adapter_path, ip_negative_path, skip_prompt_processing, use_synthetic_refiner)
# Load or unload CNs # Load or unload CNs
progressbar(async_task, current_progress, 'Loading control models ...') progressbar(async_task, current_progress, 'Loading control models ...')