sneedgroup-holder/openOutpaint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into manual-scripts

Browse source 
# Conflicts:
#	index.html
This commit is contained in:
tim h 2023-01-29 00:55:54 -06:00
commit 0400b9b284
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -460,7 +460,7 @@
src="js/ui/floating/history.js?v=4f29db4" src="js/ui/floating/history.js?v=4f29db4"
type="text/javascript"></script> type="text/javascript"></script>
<script <script
src="js/ui/floating/layers.js?v=aa78ec8" src="js/ui/floating/layers.js?v=cf1089d"
type="text/javascript"></script> type="text/javascript"></script>
<!-- Load Tools --> <!-- Load Tools -->
@ -468,7 +468,7 @@
src="js/ui/tool/generic.js?v=3e678e0" src="js/ui/tool/generic.js?v=3e678e0"
type="text/javascript"></script> type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=d1ba895" type="text/javascript"></script> <script src="js/ui/tool/dream.js?v=5050800" type="text/javascript"></script>
<script <script
src="js/ui/tool/maskbrush.js?v=d88810f" src="js/ui/tool/maskbrush.js?v=d88810f"
type="text/javascript"></script> type="text/javascript"></script>

3
js/ui/tool/dream.js
View file

@ -544,7 +544,8 @@ const _generate = async (endpoint, request, bb, options = {}) => {
addline(` + Sampler = ${request.sampler_index}`); addline(` + Sampler = ${request.sampler_index}`);
addline(` + Model = ${modelAutoComplete.value}`); addline(` + Model = ${modelAutoComplete.value}`);
addline(` + +Prompt = ${request.prompt}`); addline(` + +Prompt = ${request.prompt}`);
addline(` + -Prompt = ${request.negative_prompt}`, false); addline(` + -Prompt = ${request.negative_prompt}`);
addline(` + Styles = ${request.styles.join(", ")}`, false);
commands.runCommand( commands.runCommand(
"drawImage", "drawImage",

3
pages/configuration.html
View file

@ -133,8 +133,7 @@
localStorage.getItem("openoutpaint/settings.canvas-height") || 2048; localStorage.getItem("openoutpaint/settings.canvas-height") || 2048;
maxSteps.value = maxSteps.value =
localStorage.getItem("openoutpaint/settings.max-steps") || 70; localStorage.getItem("openoutpaint/settings.max-steps") || 70;
minCfg.value = minCfg.value = localStorage.getItem("openoutpaint/settings.min-cfg") || 1;
localStorage.getItem("openoutpaint/settings.min-cfg") || -1;
maxCfg.value = maxCfg.value =
localStorage.getItem("openoutpaint/settings.max-cfg") || 30; localStorage.getItem("openoutpaint/settings.max-cfg") || 30;
let _enable_dishonesty = let _enable_dishonesty =