Merge branch 'testing' into main

js/ui/tool/colorbrush.js

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

js/ui/tool/interrogate.js

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

js/ui/tool/maskbrush.js

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

js/ui/tool/select.js

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

js/ui/tool/stamp.js

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