diff --git a/frontend/src/common/hooks/useCheckParameters.ts b/frontend/src/common/hooks/useCheckParameters.ts index ee38b9636a..1127f40852 100644 --- a/frontend/src/common/hooks/useCheckParameters.ts +++ b/frontend/src/common/hooks/useCheckParameters.ts @@ -30,8 +30,6 @@ export const useCheckParametersSelector = createSelector( isProcessing: system.isProcessing, isConnected: system.isConnected, // inpainting - isMaskEmpty: - inpainting.lines.filter((line) => line.tool === 'brush').length === 0, hasInpaintingImage: Boolean(inpainting.imageToInpaint), }; }, @@ -56,7 +54,6 @@ const useCheckParameters = (): boolean => { activeTabName, isProcessing, isConnected, - isMaskEmpty, hasInpaintingImage, } = useAppSelector(useCheckParametersSelector); @@ -70,10 +67,7 @@ const useCheckParameters = (): boolean => { return false; } - if ( - activeTabName === 'inpainting' && - (!hasInpaintingImage || isMaskEmpty) - ) { + if (activeTabName === 'inpainting' && !hasInpaintingImage) { return false; } @@ -113,7 +107,6 @@ const useCheckParameters = (): boolean => { seedWeights, seed, activeTabName, - isMaskEmpty, hasInpaintingImage, ]); }; diff --git a/frontend/src/common/util/parameterTranslation.ts b/frontend/src/common/util/parameterTranslation.ts index 90d9adeb1f..46f0279986 100644 --- a/frontend/src/common/util/parameterTranslation.ts +++ b/frontend/src/common/util/parameterTranslation.ts @@ -127,7 +127,7 @@ export const frontendToBackendParameters = ( generationParameters.strength = img2imgStrength; generationParameters.fit = false; - const maskDataURL = generateMask(maskImageElement, lines); + const maskDataURL = generateMask(maskImageElement, lines, boundingBox); generationParameters.init_mask = maskDataURL.split( 'data:image/png;base64,' diff --git a/frontend/src/features/tabs/Inpainting/util/generateMask.ts b/frontend/src/features/tabs/Inpainting/util/generateMask.ts index d8c6e60b06..7e294198fc 100644 --- a/frontend/src/features/tabs/Inpainting/util/generateMask.ts +++ b/frontend/src/features/tabs/Inpainting/util/generateMask.ts @@ -1,4 +1,5 @@ import Konva from 'konva'; +import { IRect } from 'konva/lib/types'; import { MaskLine } from '../inpaintingSlice'; /** @@ -11,7 +12,11 @@ import { MaskLine } from '../inpaintingSlice'; * drawing the mask and compositing everything correctly to output a valid * mask image. */ -const generateMask = (image: HTMLImageElement, lines: MaskLine[]) => { +const generateMask = ( + image: HTMLImageElement, + lines: MaskLine[], + boundingBox: IRect +) => { const { width, height } = image; const offscreenContainer = document.createElement('div');