diff --git a/frontend/dist/locales/options/de.json b/frontend/dist/locales/options/de.json index fa122f200f..112926c609 100644 --- a/frontend/dist/locales/options/de.json +++ b/frontend/dist/locales/options/de.json @@ -30,7 +30,6 @@ "seamBlur": "Nahtunschärfe", "seamStrength": "Stärke der Naht", "seamSteps": "Nahtstufen", - "inpaintReplace": "Inpaint Ersetzen", "scaleBeforeProcessing": "Skalieren vor der Verarbeitung", "scaledWidth": "Skaliert W", "scaledHeight": "Skaliert H", diff --git a/frontend/dist/locales/options/en-US.json b/frontend/dist/locales/options/en-US.json index 9c3a3c6f60..f3c46bb97f 100644 --- a/frontend/dist/locales/options/en-US.json +++ b/frontend/dist/locales/options/en-US.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "Scale Before Processing", "scaledWidth": "Scaled W", "scaledHeight": "Scaled H", diff --git a/frontend/dist/locales/options/en.json b/frontend/dist/locales/options/en.json index 9c3a3c6f60..f3c46bb97f 100644 --- a/frontend/dist/locales/options/en.json +++ b/frontend/dist/locales/options/en.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "Scale Before Processing", "scaledWidth": "Scaled W", "scaledHeight": "Scaled H", diff --git a/frontend/dist/locales/options/es.json b/frontend/dist/locales/options/es.json index e722d99dbe..41eaf7d214 100644 --- a/frontend/dist/locales/options/es.json +++ b/frontend/dist/locales/options/es.json @@ -30,7 +30,6 @@ "seamBlur": "Desenfoque del parche", "seamStrength": "Fuerza del parche", "seamSteps": "Pasos del parche", - "inpaintReplace": "Reemplazar impresión interior", "scaleBeforeProcessing": "Redimensionar antes de procesar", "scaledWidth": "Ancho escalado", "scaledHeight": "Alto escalado", diff --git a/frontend/dist/locales/options/it.json b/frontend/dist/locales/options/it.json index 8ad588f32c..0228c8e5cb 100644 --- a/frontend/dist/locales/options/it.json +++ b/frontend/dist/locales/options/it.json @@ -30,7 +30,6 @@ "seamBlur": "Sfocatura cucitura", "seamStrength": "Forza della cucitura", "seamSteps": "Passaggi di cucitura", - "inpaintReplace": "Inpaint Sostituisci", "scaleBeforeProcessing": "Scala prima dell'elaborazione", "scaledWidth": "Larghezza ridimensionata", "scaledHeight": "Altezza ridimensionata", diff --git a/frontend/dist/locales/options/ja.json b/frontend/dist/locales/options/ja.json index ffc6dd3f7d..f77e0a0bc4 100644 --- a/frontend/dist/locales/options/ja.json +++ b/frontend/dist/locales/options/ja.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "処理前のスケール", "scaledWidth": "幅のスケール", "scaledHeight": "高さのスケール", diff --git a/frontend/dist/locales/options/nl.json b/frontend/dist/locales/options/nl.json index c907146115..53f587c9b5 100644 --- a/frontend/dist/locales/options/nl.json +++ b/frontend/dist/locales/options/nl.json @@ -30,7 +30,6 @@ "seamBlur": "Vervaging naad", "seamStrength": "Sterkte naad", "seamSteps": "Stappen naad", - "inpaintReplace": "Inpaintvervanging", "scaleBeforeProcessing": "Schalen voor verwerking", "scaledWidth": "Geschaalde B", "scaledHeight": "Geschaalde H", diff --git a/frontend/dist/locales/options/pl.json b/frontend/dist/locales/options/pl.json index d196f70fcb..289a013a0f 100644 --- a/frontend/dist/locales/options/pl.json +++ b/frontend/dist/locales/options/pl.json @@ -30,7 +30,6 @@ "seamBlur": "Rozmycie", "seamStrength": "Siła", "seamSteps": "Kroki", - "inpaintReplace": "Tryb podmiany", "scaleBeforeProcessing": "Tryb skalowania", "scaledWidth": "Sk. do szer.", "scaledHeight": "Sk. do wys.", diff --git a/frontend/dist/locales/options/pt_br.json b/frontend/dist/locales/options/pt_br.json index 4ab1c7c1d4..3cc0fbe4cd 100644 --- a/frontend/dist/locales/options/pt_br.json +++ b/frontend/dist/locales/options/pt_br.json @@ -30,7 +30,6 @@ "seamBlur": "Desfoque da Fronteira", "seamStrength": "Força da Fronteira", "seamSteps": "Passos da Fronteira", - "inpaintReplace": "Substituir com Inpaint", "scaleBeforeProcessing": "Escala Antes do Processamento", "scaledWidth": "L Escalada", "scaledHeight": "A Escalada", diff --git a/frontend/dist/locales/options/ru.json b/frontend/dist/locales/options/ru.json index 02ea25f929..dd85a7ac6d 100644 --- a/frontend/dist/locales/options/ru.json +++ b/frontend/dist/locales/options/ru.json @@ -30,7 +30,6 @@ "seamBlur": "Размытие шва", "seamStrength": "Сила шва", "seamSteps": "Шаги шва", - "inpaintReplace": "Inpaint-замена", "scaleBeforeProcessing": "Масштабировать", "scaledWidth": "Масштаб Ш", "scaledHeight": "Масштаб В", diff --git a/frontend/dist/locales/options/zh_cn.json b/frontend/dist/locales/options/zh_cn.json index acf098476e..cf6cf6e1c7 100644 --- a/frontend/dist/locales/options/zh_cn.json +++ b/frontend/dist/locales/options/zh_cn.json @@ -30,7 +30,6 @@ "seamBlur": "接缝模糊", "seamStrength": "接缝强度", "seamSteps": "接缝步数", - "inpaintReplace": "内画替换", "scaleBeforeProcessing": "处理前缩放", "scaledWidth": "缩放宽度", "scaledHeight": "缩放长度", diff --git a/frontend/public/locales/options/de.json b/frontend/public/locales/options/de.json index fa122f200f..112926c609 100644 --- a/frontend/public/locales/options/de.json +++ b/frontend/public/locales/options/de.json @@ -30,7 +30,6 @@ "seamBlur": "Nahtunschärfe", "seamStrength": "Stärke der Naht", "seamSteps": "Nahtstufen", - "inpaintReplace": "Inpaint Ersetzen", "scaleBeforeProcessing": "Skalieren vor der Verarbeitung", "scaledWidth": "Skaliert W", "scaledHeight": "Skaliert H", diff --git a/frontend/public/locales/options/en-US.json b/frontend/public/locales/options/en-US.json index 9c3a3c6f60..f3c46bb97f 100644 --- a/frontend/public/locales/options/en-US.json +++ b/frontend/public/locales/options/en-US.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "Scale Before Processing", "scaledWidth": "Scaled W", "scaledHeight": "Scaled H", diff --git a/frontend/public/locales/options/en.json b/frontend/public/locales/options/en.json index 9c3a3c6f60..f3c46bb97f 100644 --- a/frontend/public/locales/options/en.json +++ b/frontend/public/locales/options/en.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "Scale Before Processing", "scaledWidth": "Scaled W", "scaledHeight": "Scaled H", diff --git a/frontend/public/locales/options/es.json b/frontend/public/locales/options/es.json index e722d99dbe..41eaf7d214 100644 --- a/frontend/public/locales/options/es.json +++ b/frontend/public/locales/options/es.json @@ -30,7 +30,6 @@ "seamBlur": "Desenfoque del parche", "seamStrength": "Fuerza del parche", "seamSteps": "Pasos del parche", - "inpaintReplace": "Reemplazar impresión interior", "scaleBeforeProcessing": "Redimensionar antes de procesar", "scaledWidth": "Ancho escalado", "scaledHeight": "Alto escalado", diff --git a/frontend/public/locales/options/it.json b/frontend/public/locales/options/it.json index 8ad588f32c..0228c8e5cb 100644 --- a/frontend/public/locales/options/it.json +++ b/frontend/public/locales/options/it.json @@ -30,7 +30,6 @@ "seamBlur": "Sfocatura cucitura", "seamStrength": "Forza della cucitura", "seamSteps": "Passaggi di cucitura", - "inpaintReplace": "Inpaint Sostituisci", "scaleBeforeProcessing": "Scala prima dell'elaborazione", "scaledWidth": "Larghezza ridimensionata", "scaledHeight": "Altezza ridimensionata", diff --git a/frontend/public/locales/options/ja.json b/frontend/public/locales/options/ja.json index ffc6dd3f7d..f77e0a0bc4 100644 --- a/frontend/public/locales/options/ja.json +++ b/frontend/public/locales/options/ja.json @@ -30,7 +30,6 @@ "seamBlur": "Seam Blur", "seamStrength": "Seam Strength", "seamSteps": "Seam Steps", - "inpaintReplace": "Inpaint Replace", "scaleBeforeProcessing": "処理前のスケール", "scaledWidth": "幅のスケール", "scaledHeight": "高さのスケール", diff --git a/frontend/public/locales/options/nl.json b/frontend/public/locales/options/nl.json index c907146115..53f587c9b5 100644 --- a/frontend/public/locales/options/nl.json +++ b/frontend/public/locales/options/nl.json @@ -30,7 +30,6 @@ "seamBlur": "Vervaging naad", "seamStrength": "Sterkte naad", "seamSteps": "Stappen naad", - "inpaintReplace": "Inpaintvervanging", "scaleBeforeProcessing": "Schalen voor verwerking", "scaledWidth": "Geschaalde B", "scaledHeight": "Geschaalde H", diff --git a/frontend/public/locales/options/pl.json b/frontend/public/locales/options/pl.json index d196f70fcb..289a013a0f 100644 --- a/frontend/public/locales/options/pl.json +++ b/frontend/public/locales/options/pl.json @@ -30,7 +30,6 @@ "seamBlur": "Rozmycie", "seamStrength": "Siła", "seamSteps": "Kroki", - "inpaintReplace": "Tryb podmiany", "scaleBeforeProcessing": "Tryb skalowania", "scaledWidth": "Sk. do szer.", "scaledHeight": "Sk. do wys.", diff --git a/frontend/public/locales/options/pt_br.json b/frontend/public/locales/options/pt_br.json index 4ab1c7c1d4..3cc0fbe4cd 100644 --- a/frontend/public/locales/options/pt_br.json +++ b/frontend/public/locales/options/pt_br.json @@ -30,7 +30,6 @@ "seamBlur": "Desfoque da Fronteira", "seamStrength": "Força da Fronteira", "seamSteps": "Passos da Fronteira", - "inpaintReplace": "Substituir com Inpaint", "scaleBeforeProcessing": "Escala Antes do Processamento", "scaledWidth": "L Escalada", "scaledHeight": "A Escalada", diff --git a/frontend/public/locales/options/ru.json b/frontend/public/locales/options/ru.json index 02ea25f929..dd85a7ac6d 100644 --- a/frontend/public/locales/options/ru.json +++ b/frontend/public/locales/options/ru.json @@ -30,7 +30,6 @@ "seamBlur": "Размытие шва", "seamStrength": "Сила шва", "seamSteps": "Шаги шва", - "inpaintReplace": "Inpaint-замена", "scaleBeforeProcessing": "Масштабировать", "scaledWidth": "Масштаб Ш", "scaledHeight": "Масштаб В", diff --git a/frontend/public/locales/options/zh_cn.json b/frontend/public/locales/options/zh_cn.json index acf098476e..cf6cf6e1c7 100644 --- a/frontend/public/locales/options/zh_cn.json +++ b/frontend/public/locales/options/zh_cn.json @@ -30,7 +30,6 @@ "seamBlur": "接缝模糊", "seamStrength": "接缝强度", "seamSteps": "接缝步数", - "inpaintReplace": "内画替换", "scaleBeforeProcessing": "处理前缩放", "scaledWidth": "缩放宽度", "scaledHeight": "缩放长度", diff --git a/frontend/src/common/util/parameterTranslation.ts b/frontend/src/common/util/parameterTranslation.ts index cf9bb225ef..02ae01fdba 100644 --- a/frontend/src/common/util/parameterTranslation.ts +++ b/frontend/src/common/util/parameterTranslation.ts @@ -196,8 +196,6 @@ export const frontendToBackendParameters = ( layerState: { objects }, boundingBoxCoordinates, boundingBoxDimensions, - inpaintReplace, - shouldUseInpaintReplace, stageScale, isMaskEnabled, shouldPreserveMaskedArea, @@ -223,10 +221,6 @@ export const frontendToBackendParameters = ( generationParameters.invert_mask = shouldPreserveMaskedArea; - if (shouldUseInpaintReplace) { - generationParameters.inpaint_replace = inpaintReplace; - } - generationParameters.bounding_box = boundingBox; const tempScale = canvasBaseLayer.scale(); diff --git a/frontend/src/features/canvas/store/canvasSlice.ts b/frontend/src/features/canvas/store/canvasSlice.ts index 29aaa6342d..ef0d0cef48 100644 --- a/frontend/src/features/canvas/store/canvasSlice.ts +++ b/frontend/src/features/canvas/store/canvasSlice.ts @@ -49,7 +49,6 @@ const initialCanvasState: CanvasState = { cursorPosition: null, doesCanvasNeedScaling: false, futureLayerStates: [], - inpaintReplace: 0.1, isCanvasInitialized: false, isDrawing: false, isMaskEnabled: true, @@ -82,7 +81,6 @@ const initialCanvasState: CanvasState = { shouldShowStagingImage: true, shouldShowStagingOutline: true, shouldSnapToGrid: true, - shouldUseInpaintReplace: false, stageCoordinates: { x: 0, y: 0 }, stageDimensions: { width: 0, height: 0 }, stageScale: 1, @@ -264,12 +262,6 @@ export const canvasSlice = createSlice({ state.pastLayerStates = []; state.futureLayerStates = []; }, - setShouldUseInpaintReplace: (state, action: PayloadAction) => { - state.shouldUseInpaintReplace = action.payload; - }, - setInpaintReplace: (state, action: PayloadAction) => { - state.inpaintReplace = action.payload; - }, setShouldLockBoundingBox: (state, action: PayloadAction) => { state.shouldLockBoundingBox = action.payload; }, @@ -858,7 +850,6 @@ export const { setCursorPosition, setDoesCanvasNeedScaling, setInitialCanvasImage, - setInpaintReplace, setIsDrawing, setIsMaskEnabled, setIsMouseOverBoundingBox, @@ -885,7 +876,6 @@ export const { setShouldShowStagingImage, setShouldShowStagingOutline, setShouldSnapToGrid, - setShouldUseInpaintReplace, setStageCoordinates, setStageScale, setTool, diff --git a/frontend/src/features/canvas/store/canvasTypes.ts b/frontend/src/features/canvas/store/canvasTypes.ts index d2f93b39ef..f70d33fe5c 100644 --- a/frontend/src/features/canvas/store/canvasTypes.ts +++ b/frontend/src/features/canvas/store/canvasTypes.ts @@ -125,7 +125,6 @@ export interface CanvasState { cursorPosition: Vector2d | null; doesCanvasNeedScaling: boolean; futureLayerStates: CanvasLayerState[]; - inpaintReplace: number; intermediateImage?: InvokeAI.Image; isCanvasInitialized: boolean; isDrawing: boolean; @@ -159,7 +158,6 @@ export interface CanvasState { shouldShowStagingImage: boolean; shouldShowStagingOutline: boolean; shouldSnapToGrid: boolean; - shouldUseInpaintReplace: boolean; stageCoordinates: Vector2d; stageDimensions: Dimensions; stageScale: number; diff --git a/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx b/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx index 95f2c7147d..4c3895a911 100644 --- a/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx +++ b/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx @@ -21,7 +21,6 @@ import { systemSelector } from 'features/system/store/systemSelectors'; import _ from 'lodash'; import { ChangeEvent } from 'react'; import { useTranslation } from 'react-i18next'; -import InpaintReplace from './InpaintReplace'; const selector = createSelector( [optionsSelector, systemSelector, canvasSelector], @@ -148,7 +147,6 @@ const InfillAndScalingOptions = () => { withReset handleReset={handleResetScaledHeight} /> - { - const { inpaintReplace, shouldUseInpaintReplace } = canvas; - return { - inpaintReplace, - shouldUseInpaintReplace, - }; - }, - { - memoizeOptions: { - resultEqualityCheck: _.isEqual, - }, - } -); - -export default function InpaintReplace() { - const { inpaintReplace, shouldUseInpaintReplace } = useAppSelector(selector); - - const dispatch = useAppDispatch(); - - const { t } = useTranslation(); - - return ( - - { - dispatch(setInpaintReplace(v)); - }} - min={0} - max={1.0} - step={0.05} - isInteger={false} - isSliderDisabled={!shouldUseInpaintReplace} - withSliderMarks - sliderMarkRightOffset={-2} - withReset - handleReset={() => dispatch(setInpaintReplace(0.1))} - withInput - isResetDisabled={!shouldUseInpaintReplace} - /> - ) => - dispatch(setShouldUseInpaintReplace(e.target.checked)) - } - marginTop="1.25rem" - /> - - ); -}