From 8ed10c732baa583a54b46562480af20e546a7fbd Mon Sep 17 00:00:00 2001
From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com>
Date: Fri, 11 Nov 2022 21:52:25 +1300
Subject: [PATCH] Revert "Fix Inpainting Canvas Rendering"

This reverts commit 114a74982944fbcd0feb3ce79e81fade4d3da147.
---
 frontend/src/features/canvas/IAICanvas.tsx    | 47 +++++++++----------
 .../canvas/IAICanvasMaskCompositer.tsx        |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/frontend/src/features/canvas/IAICanvas.tsx b/frontend/src/features/canvas/IAICanvas.tsx
index e3ec8a7efc..23ebd40925 100644
--- a/frontend/src/features/canvas/IAICanvas.tsx
+++ b/frontend/src/features/canvas/IAICanvas.tsx
@@ -1,7 +1,7 @@
 // lib
 import { MutableRefObject, useEffect, useRef, useState } from 'react';
 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 { Stage as StageType } from 'konva/lib/Stage';
 
@@ -233,31 +233,30 @@ const IAICanvas = () => {
             <IAICanvasOutpaintingObjects />
             <IAICanvasIntermediateImage />
           </Layer>
-          <Layer id={'mask-layer'} listening={false}>
-            <IAICanvasMaskLines visible={isMaskEnabled} listening={false} />
+          <Layer id={'mask-layer'} visible={isMaskEnabled} listening={false}>
+            <IAICanvasMaskLines visible={true} listening={false} />
 
-            <IAICanvasMaskCompositer
-              listening={false}
-              globalCompositeOperation="source-in"
-            />
+            <IAICanvasMaskCompositer listening={false} />
 
-            <Group globalCompositeOperation="destination-over">
-              {canvasBgImage && (
-                <>
-                  <KonvaImage
-                    image={canvasBgImage}
-                    listening={false}
-                    visible={!shouldInvertMask}
-                  />
-                  <KonvaImage
-                    image={canvasBgImage}
-                    listening={false}
-                    globalCompositeOperation="source-in"
-                    visible={shouldInvertMask}
-                  />
-                </>
-              )}
-            </Group>
+            {canvasBgImage && (
+              <>
+                <KonvaImage
+                  image={canvasBgImage}
+                  listening={false}
+                  globalCompositeOperation="source-in"
+                  visible={shouldInvertMask}
+                />
+
+                <KonvaImage
+                  image={canvasBgImage}
+                  listening={false}
+                  globalCompositeOperation="source-out"
+                  visible={
+                    !shouldInvertMask && shouldShowCheckboardTransparency
+                  }
+                />
+              </>
+            )}
           </Layer>
           <Layer id={'preview-layer'}>
             <IAICanvasBoundingBoxPreview visible={shouldShowBoundingBox} />
diff --git a/frontend/src/features/canvas/IAICanvasMaskCompositer.tsx b/frontend/src/features/canvas/IAICanvasMaskCompositer.tsx
index 506fbdc76e..c3e218eff4 100644
--- a/frontend/src/features/canvas/IAICanvasMaskCompositer.tsx
+++ b/frontend/src/features/canvas/IAICanvasMaskCompositer.tsx
@@ -39,7 +39,7 @@ const IAICanvasMaskCompositer = (props: IAICanvasMaskCompositerProps) => {
       height={stageDimensions.height / stageScale}
       width={stageDimensions.width / stageScale}
       fill={maskColorString}
-      globalCompositeOperation={'source-over'}
+      globalCompositeOperation={'source-in'}
       listening={false}
       {...rest}
     />