Merge remote-tracking branch 'upstream/main' into feature/checkbox-config

# Conflicts: # modules/config.py # webui.py
feat: count image from 1, making config keys more user friendly
2026-08-16 13:13:16 +02:00 · 2024-07-27 23:06:03 +02:00 · 2024-07-27 23:04:54 +02:00 · 2024-07-27 21:34:07 +02:00 · 2024-07-27 21:15:51 +02:00 · 2024-07-27 20:42:54 +02:00
2 changed files with 2 additions and 0 deletions
@@ -517,6 +517,7 @@ default_ip_weights = {}
 default_ip_types = {}

 for image_count in range(default_controlnet_image_count):
+    image_count += 1
    default_ip_images[image_count] = get_config_item_or_set_default(
        key=f'default_ip_image_{image_count}',
        default_value=None,
@@ -221,6 +221,7 @@ with shared.gradio_root:
                            ip_ctrls = []
                            ip_ad_cols = []
                            for image_count in range(modules.config.default_controlnet_image_count):
+                                image_count += 1
                                with gr.Column():
                                    ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300, value=modules.config.default_ip_images[image_count])
                                    ip_images.append(ip_image)
Author	SHA1	Message	Date
Manuel Schmid	4e1eaa907f	Merge remote-tracking branch 'upstream/main' into feature/checkbox-config # Conflicts: # modules/config.py # webui.py	2024-07-27 23:06:03 +02:00
Manuel Schmid	8cc246a51d	feat: count image from 1, making config keys more user friendly	2024-07-27 23:04:54 +02:00
Manuel Schmid	4a5f691b9e	feat: add config for selected tab, rename desc to describe	2024-07-27 21:34:07 +02:00
Manuel Schmid	0b1fe42971	feat: add configs for controlnet default_controlnet_image_count, ip_images, ip_stop_ats, ip_weights and ip_types	2024-07-27 21:15:51 +02:00
Manuel Schmid	f5906f27a0	feat: add config for default_uov_method	2024-07-27 20:42:54 +02:00
Manuel Schmid	30c0d8f282	refactor: regroup checkbox configs	2024-07-27 20:38:58 +02:00
Manuel Schmid	c247f114d7	feat: add config for default_developer_debug_mode_checkbox	2024-07-27 20:36:11 +02:00
Manuel Schmid	f826bc16f7	feat: add config for default_invert_mask_checkbox	2024-07-27 20:28:35 +02:00
Manuel Schmid	017587a2fb	feat: add config for default_inpaint_advanced_masking_checkbox	2024-07-27 20:28:15 +02:00
Manuel Schmid	fa548f049d	feat: add config for default_image_prompt_advanced_checkbox	2024-07-27 20:25:44 +02:00
Manuel Schmid	8575c149da	feat: add config default_image_prompt_checkbox	2024-07-27 20:24:07 +02:00
Manuel Schmid	3c0f7bd722	Merge remote-tracking branch 'upstream/main' into develop_upstream	2024-07-27 20:16:40 +02:00
Manuel Schmid	591f09d106	docs: update numbering of basic debug procedure in issue template	2024-07-27 13:14:01 +02:00