Bing-su/adetailer
1
0
Fork 0
mirror of https://github.com/Bing-su/adetailer.git synced 2026-05-01 03:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: disable controlnet unit forge, fix C901

Browse Source
This commit is contained in:
Dowon
2024-02-28 20:56:17 +09:00
parent 4e4726c71c
commit cfc9f98e56
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/!adetailer.py
View File

@@ -522,14 +522,13 @@ class AfterDetailerScript(scripts.Script):
i2i._ad_disabled = True i2i._ad_disabled = True
i2i._ad_inner = True i2i._ad_inner = True
if not controlnet_forge: if args.ad_controlnet_model != "Passthrough" and not controlnet_forge:
if args.ad_controlnet_model != "Passthrough": self.disable_controlnet_units(i2i.script_args)
self.disable_controlnet_units(i2i.script_args)
if args.ad_controlnet_model not in ["None", "Passthrough"]: if args.ad_controlnet_model not in ["None", "Passthrough"]:
self.update_controlnet_args(i2i, args) self.update_controlnet_args(i2i, args)
elif args.ad_controlnet_model == "None": elif args.ad_controlnet_model == "None":
i2i.control_net_enabled = False i2i.control_net_enabled = False
return i2i return i2i
@@ -667,7 +666,7 @@ class AfterDetailerScript(scripts.Script):
else: else:
p._ad_disabled = True p._ad_disabled = True
def _postprocess_image_inner( # noqa: C901 def _postprocess_image_inner(
self, p, pp, args: ADetailerArgs, *, n: int = 0 self, p, pp, args: ADetailerArgs, *, n: int = 0
) -> bool: ) -> bool:
""" """
@@ -735,12 +734,6 @@ class AfterDetailerScript(scripts.Script):
p2.seed = self.get_each_tap_seed(seed, j) p2.seed = self.get_each_tap_seed(seed, j)
p2.subseed = self.get_each_tap_seed(subseed, j) p2.subseed = self.get_each_tap_seed(subseed, j)
if controlnet_forge:
if args.ad_controlnet_model not in "None":
self.update_controlnet_args(p2, args)
else:
p2.control_net_enabled = False
try: try:
processed = process_images(p2) processed = process_images(p2)
except NansException as e: except NansException as e: