Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove paste back from inpainting too

Browse Source
This commit is contained in:
blessedcoolant 2023-08-24 05:17:40 +12:00 committed by Kent Keirsey
parent 8277bfab5e
commit 5141e82f88
2 changed files with 6 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasInpaintGraph.ts
View File

@ -18,7 +18,6 @@ import {
CANVAS_INPAINT_GRAPH, CANVAS_INPAINT_GRAPH,
CANVAS_OUTPUT, CANVAS_OUTPUT,
CLIP_SKIP, CLIP_SKIP,
COLOR_CORRECT,
DENOISE_LATENTS, DENOISE_LATENTS,
INPAINT_IMAGE, INPAINT_IMAGE,
INPAINT_IMAGE_RESIZE_DOWN, INPAINT_IMAGE_RESIZE_DOWN,
@ -145,17 +144,11 @@ export const buildCanvasInpaintGraph = (
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32: vaePrecision === 'fp32' ? true : false,
}, },
[COLOR_CORRECT]: {
type: 'color_correct',
id: COLOR_CORRECT,
is_intermediate: true,
reference: canvasInitImage,
},
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'img_paste', type: 'color_correct',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
base_image: canvasInitImage, reference: canvasInitImage,
}, },
[RANGE_OF_SIZE]: { [RANGE_OF_SIZE]: {
type: 'range_of_size', type: 'range_of_size',
@ -384,7 +377,7 @@ export const buildCanvasInpaintGraph = (
field: 'image', field: 'image',
}, },
destination: { destination: {
node_id: COLOR_CORRECT, node_id: CANVAS_OUTPUT,
field: 'image', field: 'image',
}, },
}, },
@ -398,27 +391,6 @@ export const buildCanvasInpaintGraph = (
field: 'image', field: 'image',
}, },
}, },
{
source: {
node_id: MASK_RESIZE_DOWN,
field: 'image',
},
destination: {
node_id: COLOR_CORRECT,
field: 'mask',
},
},
// Paste Back Onto Original Image
{
source: {
node_id: COLOR_CORRECT,
field: 'image',
},
destination: {
node_id: CANVAS_OUTPUT,
field: 'image',
},
},
{ {
source: { source: {
node_id: MASK_RESIZE_DOWN, node_id: MASK_RESIZE_DOWN,
@ -453,27 +425,6 @@ export const buildCanvasInpaintGraph = (
node_id: LATENTS_TO_IMAGE, node_id: LATENTS_TO_IMAGE,
field: 'image', field: 'image',
}, },
destination: {
node_id: COLOR_CORRECT,
field: 'image',
},
},
{
source: {
node_id: MASK_BLUR,
field: 'image',
},
destination: {
node_id: COLOR_CORRECT,
field: 'mask',
},
},
// Paste Back Onto Original Image
{
source: {
node_id: COLOR_CORRECT,
field: 'image',
},
destination: { destination: {
node_id: CANVAS_OUTPUT, node_id: CANVAS_OUTPUT,
field: 'image', field: 'image',

55
invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLInpaintGraph.ts
View File

@ -17,7 +17,6 @@ import { addVAEToGraph } from './addVAEToGraph';
import { addWatermarkerToGraph } from './addWatermarkerToGraph'; import { addWatermarkerToGraph } from './addWatermarkerToGraph';
import { import {
CANVAS_OUTPUT, CANVAS_OUTPUT,
COLOR_CORRECT,
INPAINT_IMAGE, INPAINT_IMAGE,
INPAINT_IMAGE_RESIZE_DOWN, INPAINT_IMAGE_RESIZE_DOWN,
INPAINT_IMAGE_RESIZE_UP, INPAINT_IMAGE_RESIZE_UP,
@ -150,17 +149,11 @@ export const buildCanvasSDXLInpaintGraph = (
is_intermediate: true, is_intermediate: true,
fp32: vaePrecision === 'fp32' ? true : false, fp32: vaePrecision === 'fp32' ? true : false,
}, },
[COLOR_CORRECT]: {
type: 'color_correct',
id: COLOR_CORRECT,
is_intermediate: true,
reference: canvasInitImage,
},
[CANVAS_OUTPUT]: { [CANVAS_OUTPUT]: {
type: 'img_paste', type: 'color_correct',
id: CANVAS_OUTPUT, id: CANVAS_OUTPUT,
is_intermediate: !shouldAutoSave, is_intermediate: !shouldAutoSave,
base_image: canvasInitImage, reference: canvasInitImage,
}, },
[RANGE_OF_SIZE]: { [RANGE_OF_SIZE]: {
type: 'range_of_size', type: 'range_of_size',
@ -398,7 +391,7 @@ export const buildCanvasSDXLInpaintGraph = (
field: 'image', field: 'image',
}, },
destination: { destination: {
node_id: COLOR_CORRECT, node_id: CANVAS_OUTPUT,
field: 'image', field: 'image',
}, },
}, },
@ -412,27 +405,6 @@ export const buildCanvasSDXLInpaintGraph = (
field: 'image', field: 'image',
}, },
}, },
{
source: {
node_id: MASK_RESIZE_DOWN,
field: 'image',
},
destination: {
node_id: COLOR_CORRECT,
field: 'mask',
},
},
// Paste Back Onto Original Image
{
source: {
node_id: COLOR_CORRECT,
field: 'image',
},
destination: {
node_id: CANVAS_OUTPUT,
field: 'image',
},
},
{ {
source: { source: {
node_id: MASK_RESIZE_DOWN, node_id: MASK_RESIZE_DOWN,
@ -467,27 +439,6 @@ export const buildCanvasSDXLInpaintGraph = (
node_id: LATENTS_TO_IMAGE, node_id: LATENTS_TO_IMAGE,
field: 'image', field: 'image',
}, },
destination: {
node_id: COLOR_CORRECT,
field: 'image',
},
},
{
source: {
node_id: MASK_BLUR,
field: 'image',
},
destination: {
node_id: COLOR_CORRECT,
field: 'mask',
},
},
// Paste Back Onto Original Image
{
source: {
node_id: COLOR_CORRECT,
field: 'image',
},
destination: { destination: {
node_id: CANVAS_OUTPUT, node_id: CANVAS_OUTPUT,
field: 'image', field: 'image',