From 0fa9d269ecb78825bf7fcb664601a6b4576daaad Mon Sep 17 00:00:00 2001 From: iperov Date: Thu, 4 Apr 2019 16:34:45 +0400 Subject: [PATCH] fixes --- converters/ConverterMasked.py | 2 +- mainscripts/MaskEditorTool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/converters/ConverterMasked.py b/converters/ConverterMasked.py index b5d7c6f..1b7e3cc 100644 --- a/converters/ConverterMasked.py +++ b/converters/ConverterMasked.py @@ -81,7 +81,7 @@ class ConverterMasked(Converter): else: self.mask_mode = np.clip ( io.input_int ("Mask mode: (1) learned, (2) dst . Default - %d : " % (1) , 1), 1, 2 ) - if self.mask_mode >= 3 or self.mask_mode <= 6: + if self.mask_mode >= 3 and self.mask_mode <= 6: self.fan_seg = None if self.mode != 'raw': diff --git a/mainscripts/MaskEditorTool.py b/mainscripts/MaskEditorTool.py index f8ad4cc..deb2f25 100644 --- a/mainscripts/MaskEditorTool.py +++ b/mainscripts/MaskEditorTool.py @@ -187,7 +187,7 @@ class MaskEditor: pink = np.full ( (self.h, self.w, 3), (1,0,1) ) pink_masked_img = self.img*final_mask + pink*(1-final_mask) - screens = [ (self.img, None), + screens = [ (self.img, screen_overlay), (masked_img, screen_overlay), (pink_masked_img, screen_overlay), ]