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

Revert "Fix Inpainting Canvas Rendering"

Browse Source 
This reverts commit 114a74982944fbcd0feb3ce79e81fade4d3da147.
This commit is contained in:
blessedcoolant 2022-11-11 21:52:25 +13:00
parent 82a53782d0
commit 8ed10c732b
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/src/features/canvas/IAICanvas.tsx
View File

@ -1,7 +1,7 @@
// lib // lib
import { MutableRefObject, useEffect, useRef, useState } from 'react'; import { MutableRefObject, useEffect, useRef, useState } from 'react';
import Konva from 'konva'; import Konva from 'konva';
import { Group, Layer, Stage } from 'react-konva'; import { Layer, Stage } from 'react-konva';
import { Image as KonvaImage } from 'react-konva'; import { Image as KonvaImage } from 'react-konva';
import { Stage as StageType } from 'konva/lib/Stage'; import { Stage as StageType } from 'konva/lib/Stage';
@ -233,31 +233,30 @@ const IAICanvas = () => {
<IAICanvasOutpaintingObjects /> <IAICanvasOutpaintingObjects />
<IAICanvasIntermediateImage /> <IAICanvasIntermediateImage />
</Layer> </Layer>
<Layer id={'mask-layer'} listening={false}> <Layer id={'mask-layer'} visible={isMaskEnabled} listening={false}>
<IAICanvasMaskLines visible={isMaskEnabled} listening={false} /> <IAICanvasMaskLines visible={true} listening={false} />
<IAICanvasMaskCompositer <IAICanvasMaskCompositer listening={false} />
listening={false}
globalCompositeOperation="source-in"
/>
<Group globalCompositeOperation="destination-over">
{canvasBgImage && ( {canvasBgImage && (
<> <>
<KonvaImage
image={canvasBgImage}
listening={false}
visible={!shouldInvertMask}
/>
<KonvaImage <KonvaImage
image={canvasBgImage} image={canvasBgImage}
listening={false} listening={false}
globalCompositeOperation="source-in" globalCompositeOperation="source-in"
visible={shouldInvertMask} visible={shouldInvertMask}
/> />
<KonvaImage
image={canvasBgImage}
listening={false}
globalCompositeOperation="source-out"
visible={
!shouldInvertMask && shouldShowCheckboardTransparency
}
/>
</> </>
)} )}
</Group>
</Layer> </Layer>
<Layer id={'preview-layer'}> <Layer id={'preview-layer'}>
<IAICanvasBoundingBoxPreview visible={shouldShowBoundingBox} /> <IAICanvasBoundingBoxPreview visible={shouldShowBoundingBox} />

2
frontend/src/features/canvas/IAICanvasMaskCompositer.tsx
View File

@ -39,7 +39,7 @@ const IAICanvasMaskCompositer = (props: IAICanvasMaskCompositerProps) => {
height={stageDimensions.height / stageScale} height={stageDimensions.height / stageScale}
width={stageDimensions.width / stageScale} width={stageDimensions.width / stageScale}
fill={maskColorString} fill={maskColorString}
globalCompositeOperation={'source-over'} globalCompositeOperation={'source-in'}
listening={false} listening={false}
{...rest} {...rest}
/> />