mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-10 13:32:36 +08:00
Merge branch 'comfyanonymous:master' into feature/preview-latent
This commit is contained in:
commit
a12543b540
@ -1351,35 +1351,39 @@ 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) {
|
||||||
let all_inputs = [link.origin_slot].concat(parent.inputs)
|
link = parent.getInputLink(link.origin_slot);
|
||||||
for (let parent_input in all_inputs) {
|
if (link) {
|
||||||
if (parent.inputs[parent_input].type === node.inputs[i].type) {
|
parent = parent.getInputNode(link.origin_slot);
|
||||||
link = parent.getInputLink(parent_input);
|
if (parent) {
|
||||||
if (link) {
|
|
||||||
parent = parent.getInputNode(parent_input);
|
|
||||||
}
|
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
}
|
||||||
|
}
|
||||||
|
} else if (link && parent.mode === 4) {
|
||||||
|
let all_inputs = [link.origin_slot];
|
||||||
|
if (parent.inputs) {
|
||||||
|
all_inputs = all_inputs.concat(Object.keys(parent.inputs))
|
||||||
|
for (let parent_input in all_inputs) {
|
||||||
|
parent_input = all_inputs[parent_input];
|
||||||
|
if (parent.inputs[parent_input].type === node.inputs[i].type) {
|
||||||
|
link = parent.getInputLink(parent_input);
|
||||||
|
if (link) {
|
||||||
|
parent = parent.getInputNode(parent_input);
|
||||||
|
}
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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