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.

Sign up for GitHub

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

allow not using any unit #2300

Merged
merged 1 commit into from
Dec 7, 2023
+5 −5
Merged

allow not using any unit #2300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
allow not using any unit
@lllyasviel
lllyasviel committed Dec 7, 2023
commit 12c355b603a28e207e79db1197ceb841b7ececb5
8 changes: 4 additions & 4 deletions scripts/controlnet.py
View file
Original file line number Diff line number Diff line change
@@ -707,13 +707,13 @@ def controlnet_main_entry(self, p):
if not batch_hijack.instance.is_batch:
self.enabled_units = Script.get_enabled_units(p)

if len(self.enabled_units) == 0:
self.latest_network = None
return

batch_option_uint_separate = self.ui_batch_option_state[0] == external_code.BatchOption.SEPARATE.value
batch_option_style_align = self.ui_batch_option_state[1]

if len(self.enabled_units) == 0 and not batch_option_style_align:
self.latest_network = None
return

logger.info(f"unit_separate = {batch_option_uint_separate}, style_align = {batch_option_style_align}")

detected_maps = []
2 changes: 1 addition & 1 deletion scripts/controlnet_version.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version_flag = 'v1.1.420'
version_flag = 'v1.1.421'

from scripts.logging import logger