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

Merge branch 'main' into img2img-fix

Browse source 
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 61d27f561539a40e64da7218f022f846ed9727d4
This commit is contained in:
Victor Seiji Hariki 2022-11-24 12:08:35 -03:00
commit 65961ad0a9
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/index.js
View file

@ -397,7 +397,7 @@ function checkProgress(bb) {
document.getElementById("estRemaining").innerText = estimate; document.getElementById("estRemaining").innerText = estimate;
}); });
}, 1500); }, 1000);
} }
function mouseMove(evt) { function mouseMove(evt) {

7
js/ui/toolbar.js
View file

@ -358,7 +358,14 @@ tools.img2img = toolbar.registerTool(
menu.appendChild(state.ctxmenu.snapToGridLabel); menu.appendChild(state.ctxmenu.snapToGridLabel);
menu.appendChild(document.createElement("br")); menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.denoisingStrengthSlider); menu.appendChild(state.ctxmenu.denoisingStrengthSlider);
<<<<<<< HEAD
menu.appendChild(state.ctxmenu.borderMaskSlider); menu.appendChild(state.ctxmenu.borderMaskSlider);
=======
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.useBorderMaskSlider);
menu.appendChild(document.createElement("br"));
menu.appendChild(state.ctxmenu.borderMaskSize);
>>>>>>> main
}, },
shortcut: "I", shortcut: "I",
} }