Merge branch 'main' into workspaces
This commit is contained in:
commit
59188a64bd
3 changed files with 5 additions and 4 deletions
|
@ -385,9 +385,9 @@
|
||||||
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=eb98dc9" type="text/javascript"></script>
|
<script src="js/ui/tool/dream.js?v=74c0c1f" type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/maskbrush.js?v=1e8a893"
|
src="js/ui/tool/maskbrush.js?v=d88810f"
|
||||||
type="text/javascript"></script>
|
type="text/javascript"></script>
|
||||||
<script
|
<script
|
||||||
src="js/ui/tool/colorbrush.js?v=3f8c01a"
|
src="js/ui/tool/colorbrush.js?v=3f8c01a"
|
||||||
|
|
|
@ -521,7 +521,8 @@ const _generate = async (endpoint, request, bb, options = {}) => {
|
||||||
if (!images[at]) return;
|
if (!images[at]) return;
|
||||||
images.splice(at, 1);
|
images.splice(at, 1);
|
||||||
seeds.splice(at, 1);
|
seeds.splice(at, 1);
|
||||||
if (at >= images.length) at = 0;
|
if (at > images.length - 1) prevImg();
|
||||||
|
if (images.length - 1 === 0) discardImg();
|
||||||
imageindextxt.textContent = `${at}/${images.length - 1}`;
|
imageindextxt.textContent = `${at}/${images.length - 1}`;
|
||||||
var seed = seeds[at];
|
var seed = seeds[at];
|
||||||
seedbtn.title = "Use seed " + seed;
|
seedbtn.title = "Use seed " + seed;
|
||||||
|
|
|
@ -133,7 +133,7 @@ const maskBrushTool = () =>
|
||||||
|
|
||||||
state.movecb = (evn) => {
|
state.movecb = (evn) => {
|
||||||
const vcp = {x: evn.evn.clientX, y: evn.evn.clientY};
|
const vcp = {x: evn.evn.clientX, y: evn.evn.clientY};
|
||||||
const scp = state.brushSize * viewport.zoom;
|
const scp = state.brushSize / viewport.zoom;
|
||||||
|
|
||||||
state.clearPrevCursor();
|
state.clearPrevCursor();
|
||||||
state;
|
state;
|
||||||
|
|
Loading…
Reference in a new issue