diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-03 08:57:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 08:57:14 +0000 |
| commit | b4776ea3a236c07041940ba78a50e25bc5c9a06f (patch) | |
| tree | 699daeb59a3879fddefdc0be9f93185d6f5e3193 /modules | |
| parent | fed5b1d55cb03bb2bb5a5d19dfae0fd2644137bb (diff) | |
| parent | 83e8c322762c545fd589c060811379582926060f (diff) | |
| download | stable-diffusion-webui-gfx803-b4776ea3a236c07041940ba78a50e25bc5c9a06f.tar.gz stable-diffusion-webui-gfx803-b4776ea3a236c07041940ba78a50e25bc5c9a06f.tar.bz2 stable-diffusion-webui-gfx803-b4776ea3a236c07041940ba78a50e25bc5c9a06f.zip | |
Merge pull request #14177 from catboxanon/fix/mask-composite-save
Fix `save_samples` being checked early when saving masked composite
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/processing.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/processing.py b/modules/processing.py index 5ab6ddde..4f265801 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -938,14 +938,14 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if opts.enable_pnginfo:
image.info["parameters"] = text
output_images.append(image)
- if save_samples and hasattr(p, 'mask_for_overlay') and p.mask_for_overlay and any([opts.save_mask, opts.save_mask_composite, opts.return_mask, opts.return_mask_composite]):
+ if hasattr(p, 'mask_for_overlay') and p.mask_for_overlay and any([opts.save_mask, opts.save_mask_composite, opts.return_mask, opts.return_mask_composite]):
image_mask = p.mask_for_overlay.convert('RGB')
image_mask_composite = Image.composite(image.convert('RGBA').convert('RGBa'), Image.new('RGBa', image.size), images.resize_image(2, p.mask_for_overlay, image.width, image.height).convert('L')).convert('RGBA')
- if opts.save_mask:
+ if save_samples and opts.save_mask:
images.save_image(image_mask, p.outpath_samples, "", p.seeds[i], p.prompts[i], opts.samples_format, info=infotext(i), p=p, suffix="-mask")
- if opts.save_mask_composite:
+ if save_samples and opts.save_mask_composite:
images.save_image(image_mask_composite, p.outpath_samples, "", p.seeds[i], p.prompts[i], opts.samples_format, info=infotext(i), p=p, suffix="-mask-composite")
if opts.return_mask:
|