fix(ui): merge conflict

This commit is contained in:
psychedelicious 2024-02-28 00:32:06 +11:00
parent 3141c6efd5
commit 574d6538b9

View File

@ -105,6 +105,9 @@ export const generationSlice = createSlice({
clearInitialImage: (state) => { clearInitialImage: (state) => {
state.initialImage = undefined; state.initialImage = undefined;
}, },
setMaskBlur: (state, action: PayloadAction<number>) => {
state.maskBlur = action.payload;
},
setCanvasCoherenceMode: (state, action: PayloadAction<ParameterCanvasCoherenceMode>) => { setCanvasCoherenceMode: (state, action: PayloadAction<ParameterCanvasCoherenceMode>) => {
state.canvasCoherenceMode = action.payload; state.canvasCoherenceMode = action.payload;
}, },
@ -253,6 +256,7 @@ export const {
setPositivePrompt, setPositivePrompt,
setNegativePrompt, setNegativePrompt,
setScheduler, setScheduler,
setMaskBlur,
setCanvasCoherenceMode, setCanvasCoherenceMode,
setCanvasCoherenceEdgeSize, setCanvasCoherenceEdgeSize,
setCanvasCoherenceMinDenoise, setCanvasCoherenceMinDenoise,