wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-14 15:32:35 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix reroutes updating to wildcards on graph load

Browse Source 
The type of reroutes connected to primitive nodes may be lost when the graph is loaded, depending on the configuration order of nodes. Also fixed an error when a primitive widget callback is called and is connected to a reroute without output links.
This commit is contained in:
ssit 2023-06-25 14:03:32 -04:00
parent c226b2615a
commit 3d9f4229c1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/extensions/core/rerouteNode.js
View File

@ -55,6 +55,7 @@ app.registerExtension({
let updateNodes = []; let updateNodes = [];
let inputType = null; let inputType = null;
let inputNode = null; let inputNode = null;
let rootNode = null;
while (currentNode) { while (currentNode) {
updateNodes.unshift(currentNode); updateNodes.unshift(currentNode);
const linkId = currentNode.inputs[0].link; const linkId = currentNode.inputs[0].link;
@ -76,6 +77,7 @@ app.registerExtension({
// We've found the end // We've found the end
inputNode = currentNode; inputNode = currentNode;
inputType = node.outputs[link.origin_slot]?.type ?? null; inputType = node.outputs[link.origin_slot]?.type ?? null;
rootNode = node;
break; break;
} }
} else { } else {
@ -123,6 +125,11 @@ app.registerExtension({
} }
} }
if (rootNode?.constructor.type === "PrimitiveNode" && inputType === "*") {
// Primitive doesn't have type yet, skip update
return;
}
const displayType = (inputType === "*" && outputType) || inputType || outputType || "*"; const displayType = (inputType === "*" && outputType) || inputType || outputType || "*";
const color = LGraphCanvas.link_type_colors[displayType]; const color = LGraphCanvas.link_type_colors[displayType];

2
web/extensions/core/widgetInputs.js
View File

@ -210,7 +210,7 @@ app.registerExtension({
function get_links(node) { function get_links(node) {
let links = []; let links = [];
for (const l of node.outputs[0].links) { for (const l of node.outputs[0].links ?? []) {
const linkInfo = app.graph.links[l]; const linkInfo = app.graph.links[l];
const n = node.graph.getNodeById(linkInfo.target_id); const n = node.graph.getNodeById(linkInfo.target_id);
if (n.type == "Reroute") { if (n.type == "Reroute") {