diff options
| author | catboxanon <122327233+catboxanon@users.noreply.github.com> | 2023-12-02 13:30:53 -0500 |
|---|---|---|
| committer | catboxanon <122327233+catboxanon@users.noreply.github.com> | 2023-12-02 13:30:53 -0500 |
| commit | 83e8c322762c545fd589c060811379582926060f (patch) | |
| tree | 4d7bb38e53d52fcdc82ddfc189900137ffdf782c | |
| parent | ac02216e540cd581f9169c6c791e55721e3117b0 (diff) | |
Fix `save_samples` being checked early when saving masked composite
| -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:
|