Skip to content

Commit 12c355b

Browse files
committed
allow not using any unit
1 parent d0e79b3 commit 12c355b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

scripts/controlnet.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -707,13 +707,13 @@ def controlnet_main_entry(self, p):
707707
if not batch_hijack.instance.is_batch:
708708
self.enabled_units = Script.get_enabled_units(p)
709709

710-
if len(self.enabled_units) == 0:
711-
self.latest_network = None
712-
return
713-
714710
batch_option_uint_separate = self.ui_batch_option_state[0] == external_code.BatchOption.SEPARATE.value
715711
batch_option_style_align = self.ui_batch_option_state[1]
716712

713+
if len(self.enabled_units) == 0 and not batch_option_style_align:
714+
self.latest_network = None
715+
return
716+
717717
logger.info(f"unit_separate = {batch_option_uint_separate}, style_align = {batch_option_style_align}")
718718

719719
detected_maps = []

scripts/controlnet_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version_flag = 'v1.1.420'
1+
version_flag = 'v1.1.421'
22

33
from scripts.logging import logger
44

0 commit comments

Comments
 (0)