diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index 6a777a1986..74f66a1303 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -1193,8 +1193,8 @@ "unableToInvoke": "Unable to Invoke" }, "maskAdjustmentsHeader": "Mask Adjustments", - "maskBlur": "Blur", - "maskBlurMethod": "Blur Method", + "maskBlur": "Mask Blur", + "maskBlurMethod": "Mask Blur Method", "maskEdge": "Mask Edge", "negativePromptPlaceholder": "Negative Prompt", "noiseSettings": "Noise", @@ -1480,8 +1480,8 @@ "Each scheduler defines how to iteratively add noise to an image or how to update a sample based on a model's output." ] }, - "compositingBlur": { - "heading": "Blur", + "compositingMaskBlur": { + "heading": "Mask Blur", "paragraphs": ["The blur radius of the mask."] }, "compositingBlurMethod": { diff --git a/invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts b/invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts index 6fb06a4287..ab03dcded2 100644 --- a/invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts +++ b/invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts @@ -6,7 +6,7 @@ export type Feature = | 'paramNegativeConditioning' | 'paramPositiveConditioning' | 'paramScheduler' - | 'compositingBlur' + | 'compositingMaskBlur' | 'compositingBlurMethod' | 'compositingCoherencePass' | 'compositingCoherenceMode' diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts index 1fced5c5c1..00bad63c3b 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts @@ -58,13 +58,13 @@ export const buildCanvasInpaintGraph = ( seed, vaePrecision, shouldUseCpuNoise, - clipSkip, seamlessXAxis, seamlessYAxis, canvasCoherenceMode, canvasCoherenceMinDenoise, canvasCoherenceEdgeSize, + maskBlur, } = state.generation; if (!model) { @@ -156,7 +156,7 @@ export const buildCanvasInpaintGraph = ( id: CANVAS_OUTPUT, is_intermediate: getIsIntermediate(state), board: getBoardField(state), - mask_blur: canvasCoherenceEdgeSize, + mask_blur: maskBlur, source_image: canvasInitImage, }, }, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts index 9ec07546af..75f9a15f48 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts @@ -71,6 +71,7 @@ export const buildCanvasOutpaintGraph = ( canvasCoherenceMode, canvasCoherenceMinDenoise, canvasCoherenceEdgeSize, + maskBlur, } = state.generation; if (!model) { @@ -176,7 +177,7 @@ export const buildCanvasOutpaintGraph = ( is_intermediate: getIsIntermediate(state), board: getBoardField(state), use_cache: false, - mask_blur: canvasCoherenceEdgeSize, + mask_blur: maskBlur, }, }, edges: [ diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts index d31f178d37..fc60805e85 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts @@ -64,6 +64,7 @@ export const buildCanvasSDXLInpaintGraph = ( canvasCoherenceMode, canvasCoherenceMinDenoise, canvasCoherenceEdgeSize, + maskBlur, } = state.generation; const { refinerModel, refinerStart } = state.sdxl; @@ -157,7 +158,7 @@ export const buildCanvasSDXLInpaintGraph = ( id: CANVAS_OUTPUT, is_intermediate: getIsIntermediate(state), board: getBoardField(state), - mask_blur: canvasCoherenceEdgeSize, + mask_blur: maskBlur, source_image: canvasInitImage, }, }, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts index 13135e4748..44950ff40a 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts @@ -71,6 +71,7 @@ export const buildCanvasSDXLOutpaintGraph = ( canvasCoherenceMode, canvasCoherenceMinDenoise, canvasCoherenceEdgeSize, + maskBlur, } = state.generation; const { refinerModel, refinerStart } = state.sdxl; @@ -176,7 +177,7 @@ export const buildCanvasSDXLOutpaintGraph = ( is_intermediate: getIsIntermediate(state), board: getBoardField(state), use_cache: false, - mask_blur: canvasCoherenceEdgeSize, + mask_blur: maskBlur, }, }, edges: [ diff --git a/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx b/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx index ca5a209db7..2218002449 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx @@ -26,7 +26,7 @@ const ParamMaskBlur = () => { return ( - + {t('parameters.maskBlur')} { + {/* - */} + */} diff --git a/invokeai/frontend/web/src/features/system/store/configSlice.ts b/invokeai/frontend/web/src/features/system/store/configSlice.ts index 707c94dee6..ded3241c5b 100644 --- a/invokeai/frontend/web/src/features/system/store/configSlice.ts +++ b/invokeai/frontend/web/src/features/system/store/configSlice.ts @@ -88,9 +88,9 @@ export const initialConfigState: AppConfig = { }, canvasCoherenceEdgeSize: { initial: 16, - sliderMin: 16, - sliderMax: 512, - numberInputMin: 16, + sliderMin: 0, + sliderMax: 128, + numberInputMin: 0, numberInputMax: 1024, fineStep: 8, coarseStep: 16, @@ -134,7 +134,7 @@ export const initialConfigState: AppConfig = { maskBlur: { initial: 16, sliderMin: 0, - sliderMax: 64, + sliderMax: 128, numberInputMin: 0, numberInputMax: 512, fineStep: 1,