Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mask blur #1907

Merged
merged 3 commits into from
Aug 13, 2023
Merged

Fix mask blur #1907

merged 3 commits into from
Aug 13, 2023

Conversation

catboxanon
Copy link
Contributor

@catboxanon catboxanon commented Aug 11, 2023

Resolves #1888, AUTOMATIC1111/stable-diffusion-webui#12428

This has been broken for about 3 months now and was never accounted for in this extension. The webui switched from using mask_blur to separate attributes for mask_blur_x and mask_blur_y in 1.4.0, so the mask_blur was read as None by ControlNet. AUTOMATIC1111/stable-diffusion-webui#10295

Uses the same code from here to modify the mask: https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/26c92f056acc795af5066779f1b8aedb8dfa983d/modules/processing.py#L1287-L1297

@catboxanon
Copy link
Contributor Author

catboxanon commented Aug 11, 2023

This may potentially not be needed as I think a fix is going to be merged upstream soon. Though, we may want this merged just to fix the 3 months of inbetween versions though people could be using (it's more likely users would update this extension rather than the webui). Coyote-A/ultimate-upscale-for-automatic1111#111 (comment)

I'm converting this to a draft for now since the sigma values are different on their branch too currently. Splendide-Imaginarius/stable-diffusion-webui@5688864 PR opened upstream with approval from the author, so these match now. Re-opening.

@catboxanon catboxanon marked this pull request as ready for review August 11, 2023 08:18
@huchenlei huchenlei self-requested a review August 13, 2023 18:17
Copy link
Collaborator

@huchenlei huchenlei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@huchenlei huchenlei merged commit 729926f into Mikubill:main Aug 13, 2023
1 check passed
tiangles pushed a commit to diffus-me/sd-webui-controlnet that referenced this pull request Aug 18, 2023
* Fix mask blur

* Prioritize mask_blur_x over mask_blur

* Update mask blur sigma values
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants