comfyanonymous/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-04-27 18:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: resolve conflict with master in nodes_load_3d.py (keep MultiType.Input + advanced markers)

Browse Source 
Amp-Thread-ID: https://ampcode.com/threads/T-019c3236-1417-74aa-82a3-bcb365fbe9d1
This commit is contained in:
bymyself
2026-02-06 01:09:32 -08:00
parent d39d98f878 a1c101f861
commit 6137685768
83 changed files with 9010 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nodes.py
View File

@@ -1001,7 +1001,7 @@ class DualCLIPLoader:
def INPUT_TYPES(s):
return {"required": { "clip_name1": (folder_paths.get_filename_list("text_encoders"), ),
"clip_name2": (folder_paths.get_filename_list("text_encoders"), ),
"type": (["sdxl", "sd3", "flux", "hunyuan_video", "hidream", "hunyuan_image", "hunyuan_video_15", "kandinsky5", "kandinsky5_image", "ltxv", "newbie"], ),
"type": (["sdxl", "sd3", "flux", "hunyuan_video", "hidream", "hunyuan_image", "hunyuan_video_15", "kandinsky5", "kandinsky5_image", "ltxv", "newbie", "ace"], ),
},
"optional": {
"device": (["default", "cpu"], {"advanced": True}),
@@ -2432,7 +2432,9 @@ async def init_builtin_extra_nodes():
"nodes_wanmove.py",
"nodes_image_compare.py",
"nodes_zimage.py",
"nodes_lora_debug.py"
"nodes_lora_debug.py",
"nodes_color.py",
"nodes_toolkit.py",
]
import_failed = []