Merge branch 'dev' into ui_mobile_optimizations

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 40598f5c..b0e240a4 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -296,7 +296,7 @@ class StableDiffusionProcessing:
         return conditioning

 

     def edit_image_conditioning(self, source_image):

-        conditioning_image = images_tensor_to_samples(source_image*0.5+0.5, approximation_indexes.get(opts.sd_vae_encode_method))

+        conditioning_image = shared.sd_model.encode_first_stage(source_image).mode()

 

         return conditioning_image

 

@@ -886,6 +886,8 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
 

             devices.torch_gc()

 

+            state.nextjob()

+

             if p.scripts is not None:

                 p.scripts.postprocess_batch(p, x_samples_ddim, batch_number=n)

 

@@ -958,8 +960,6 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
 

             devices.torch_gc()

 

-            state.nextjob()

-

         if not infotexts:

             infotexts.append(Processed(p, []).infotext(p, 0))