Merge pull request #3384 from lllyasviel/develop

Release v2.5.2

fooocus_version.py

@@ -1 +1 @@
-version = '2.5.1'
+version = '2.5.2'

modules/config.py

@@ -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,

update_log.md

@@ -1,3 +1,8 @@
+# [2.5.2](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.2)
+
+* Fix not adding positive prompt when styles didn't have a {prompt} placeholder in the positive prompt
+* Extend config settings for input image, see list in [PR](https://github.com/lllyasviel/Fooocus/pull/3382)
+
 # [2.5.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.1)
 
 * Update download URL in readme

webui.py

@@ -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)