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

Merge branch 'testing' into main

Browse source
This commit is contained in:
tim h 2022-12-18 20:36:07 -06:00
commit 58189954c7
5 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/ui/tool/colorbrush.js
View file

@ -138,6 +138,7 @@ const colorBrushTool = () =>
state.brushBlur = 0; state.brushBlur = 0;
state.brushOpacity = 1; state.brushOpacity = 1;
state.affectMask = true; state.affectMask = true;
state.block_res_change = true;
state.setBrushSize = (size) => { state.setBrushSize = (size) => {
state.brushSize = size; state.brushSize = size;
state.ctxmenu.brushSizeRange.value = size; state.ctxmenu.brushSizeRange.value = size;

1
js/ui/tool/interrogate.js
View file

@ -34,6 +34,7 @@ const interrogateTool = () =>
state.snapToGrid = true; state.snapToGrid = true;
state.invertMask = false; state.invertMask = false;
state.overMaskPx = 0; state.overMaskPx = 0;
state.block_res_change = true;
state.erasePrevReticle = () => ovLayer.clear(); state.erasePrevReticle = () => ovLayer.clear();

1
js/ui/tool/maskbrush.js
View file

@ -109,6 +109,7 @@ const maskBrushTool = () =>
state.brushSize = 64; state.brushSize = 64;
state.brushBlur = 0; state.brushBlur = 0;
state.brushOpacity = 1; state.brushOpacity = 1;
state.block_res_change = true;
state.setBrushSize = (size) => { state.setBrushSize = (size) => {
state.brushSize = size; state.brushSize = size;
state.ctxmenu.brushSizeRange.value = size; state.ctxmenu.brushSizeRange.value = size;

1
js/ui/tool/select.js
View file

@ -57,6 +57,7 @@ const selectTransformTool = () =>
state.snapToGrid = true; state.snapToGrid = true;
state.keepAspectRatio = true; state.keepAspectRatio = true;
state.block_res_change = true;
state.useClipboard = !!( state.useClipboard = !!(
navigator.clipboard && navigator.clipboard.write navigator.clipboard && navigator.clipboard.write
); // Use it by default if supported ); // Use it by default if supported

1
js/ui/tool/stamp.js
View file

@ -58,6 +58,7 @@ const stampTool = () =>
state.back = null; state.back = null;
state.lastMouseMove = {x: 0, y: 0}; state.lastMouseMove = {x: 0, y: 0};
state.block_res_change = true;
state.selectResource = (resource, nolock = true) => { state.selectResource = (resource, nolock = true) => {
if (nolock && state.ctxmenu.uploadButton.disabled) return; if (nolock && state.ctxmenu.uploadButton.disabled) return;