rework mask and mask_composite logic

                if opts.enable_pnginfo:

                    image.info["parameters"] = text

                output_images.append(image)

                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]):

                if hasattr(p, 'mask_for_overlay') and p.mask_for_overlay:

                    if opts.return_mask or opts.save_mask:

                        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 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 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:

                            output_images.append(image_mask)

                    if opts.return_mask_composite or opts.save_mask_composite:

                        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 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_composite:

                            output_images.append(image_mask_composite)