wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-07-07 15:10:50 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge 1ba3156102 into 3fe9f5fecb

Browse Source
This commit is contained in:
Christo 2026-07-04 14:10:45 +08:00 committed by GitHub
commit be518b9ee2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
comfy/samplers.py
View File

@ -309,9 +309,12 @@ def _calc_cond_batch(model: BaseModel, conds: list[list[dict]], x_in: torch.Tens
transformer_options = model.current_patcher.apply_hooks(hooks=hooks)
if 'transformer_options' in model_options:
transformer_options = comfy.patcher_extension.merge_nested_dicts(transformer_options,
model_options['transformer_options'],
copy_dict1=False)
# Hook-derived patches must stack on top of model patches, so
# model's transformer_options is dict1 (existing) and the
# hook-derived dict is dict2 (extends model's lists).
transformer_options = comfy.patcher_extension.merge_nested_dicts(model_options['transformer_options'],
transformer_options,
copy_dict1=True)
if patches is not None:
transformer_options["patches"] = comfy.patcher_extension.merge_nested_dicts(