update

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log for SD.Next
 
-## Update for 2024-02-17
+## Update for 2024-02-18
 
 - **Improvements**:
   - **IP Adapter** major refactor  
@@ -91,6 +91,7 @@
   - fix controlnet inpaint mask  
   - fix theme list refresh  
   - fix extensions update information in ui  
+  - fix model merge manual merge settings, thanks @AI-Casanova  
   - bind controlnet extension to last known working commit, thanks @Aptronymist  
   - prompts-from-file fix resizable prompt area  
 

TODO.md

@@ -7,6 +7,7 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma
 - stable cascade
 - init latents, variations, tiling
 - lora sliders: <https://github.com/vladmandic/automatic/issues/2868>
+- x-adapoter: <https://github.com/showlab/X-Adapter>
 - diffusers public callbacks  
 - image2video: pia and vgen pipelines  
 - video2video

modules/processing_class.py

@@ -104,6 +104,7 @@ class StableDiffusionProcessing:
         self.s_tmax = float('inf')  # not representable as a standard ui option
         self.task_args = {}
         # a1111 compatibility items
+        self.batch_index = 0
         self.refiner_switch_at = 0
         self.hr_prompt = ''
         self.all_hr_prompts = []