mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
fix(ui): merge conflict
This commit is contained in:
parent
3141c6efd5
commit
574d6538b9
@ -105,6 +105,9 @@ export const generationSlice = createSlice({
|
||||
clearInitialImage: (state) => {
|
||||
state.initialImage = undefined;
|
||||
},
|
||||
setMaskBlur: (state, action: PayloadAction<number>) => {
|
||||
state.maskBlur = action.payload;
|
||||
},
|
||||
setCanvasCoherenceMode: (state, action: PayloadAction<ParameterCanvasCoherenceMode>) => {
|
||||
state.canvasCoherenceMode = action.payload;
|
||||
},
|
||||
@ -253,6 +256,7 @@ export const {
|
||||
setPositivePrompt,
|
||||
setNegativePrompt,
|
||||
setScheduler,
|
||||
setMaskBlur,
|
||||
setCanvasCoherenceMode,
|
||||
setCanvasCoherenceEdgeSize,
|
||||
setCanvasCoherenceMinDenoise,
|
||||
|
Loading…
Reference in New Issue
Block a user