Merge branch 'main' into 7.5
This commit is contained in:
@@ -1 +1 @@
|
|||||||
blank_issues_enabled: false
|
blank_issues_enabled: true
|
||||||
|
|||||||
@@ -29,4 +29,3 @@ export const deferred_actions = new Deferred()
|
|||||||
|
|
||||||
export const shared = new Shared()
|
export const shared = new Shared()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -240,6 +240,10 @@ app.registerExtension({
|
|||||||
return await shared.graphAnalyser.graph_to_prompt( );
|
return await shared.graphAnalyser.graph_to_prompt( );
|
||||||
} else {
|
} else {
|
||||||
Logger.log_problem("graphToPrompt called when !prompt_being_queued - why?")
|
Logger.log_problem("graphToPrompt called when !prompt_being_queued - why?")
|
||||||
|
if (app.ui.settings.getSettingValue("Use Everywhere.Options.always_modify_graph")) {
|
||||||
|
Logger.log_info("always_modify_graph is set, so doing so anyway")
|
||||||
|
return await shared.graphAnalyser.graph_to_prompt( );
|
||||||
|
}
|
||||||
return await original_graphToPrompt.apply(app, arguments);
|
return await original_graphToPrompt.apply(app, arguments);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,14 @@ const _SETTINGS = [
|
|||||||
tooltip: "Turn off workflow validation (which tends to replace UE links with real ones)",
|
tooltip: "Turn off workflow validation (which tends to replace UE links with real ones)",
|
||||||
onChange: settingsCache.onSettingChange,
|
onChange: settingsCache.onSettingChange,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: "Use Everywhere.Options.always_modify_graph",
|
||||||
|
name: "Always modify graph",
|
||||||
|
type: "boolean",
|
||||||
|
defaultValue: false,
|
||||||
|
tooltip: "If turned on, the UE modifications will apply even if the trigger is unknown. This will enable API exports, but may cause incompatibility with other nodes.",
|
||||||
|
onChange: settingsCache.onSettingChange,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: "Use Everywhere.Options.use_output_name",
|
id: "Use Everywhere.Options.use_output_name",
|
||||||
name: "When connecting, use the output slot's name as the input name",
|
name: "When connecting, use the output slot's name as the input name",
|
||||||
|
|||||||
Reference in New Issue
Block a user