mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2025-04-20 03:13:30 +00:00
Fix reroute nodes not working with bypassed nodes.
This commit is contained in:
parent
05321fd947
commit
19fbab6ce3
@ -1351,9 +1351,17 @@ export class ComfyApp {
|
|||||||
let parent = node.getInputNode(i);
|
let parent = node.getInputNode(i);
|
||||||
if (parent) {
|
if (parent) {
|
||||||
let link = node.getInputLink(i);
|
let link = node.getInputLink(i);
|
||||||
while (parent.mode === 4) {
|
while (parent.mode === 4 || parent.isVirtualNode) {
|
||||||
let found = false;
|
let found = false;
|
||||||
if (link) {
|
if (parent.isVirtualNode) {
|
||||||
|
link = parent.getInputLink(link.origin_slot);
|
||||||
|
if (link) {
|
||||||
|
parent = parent.getInputNode(link.origin_slot);
|
||||||
|
if (parent) {
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (link && parent.mode === 4) {
|
||||||
let all_inputs = [link.origin_slot].concat(parent.inputs)
|
let all_inputs = [link.origin_slot].concat(parent.inputs)
|
||||||
for (let parent_input in all_inputs) {
|
for (let parent_input in all_inputs) {
|
||||||
if (parent.inputs[parent_input].type === node.inputs[i].type) {
|
if (parent.inputs[parent_input].type === node.inputs[i].type) {
|
||||||
@ -1366,20 +1374,13 @@ export class ComfyApp {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!found) {
|
if (!found) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while (parent && parent.isVirtualNode) {
|
|
||||||
link = parent.getInputLink(link.origin_slot);
|
|
||||||
if (link) {
|
|
||||||
parent = parent.getInputNode(link.origin_slot);
|
|
||||||
} else {
|
|
||||||
parent = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (link) {
|
if (link) {
|
||||||
inputs[node.inputs[i].name] = [String(link.origin_id), parseInt(link.origin_slot)];
|
inputs[node.inputs[i].name] = [String(link.origin_id), parseInt(link.origin_slot)];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user