Extra networks loading fix

1 files changed, 3 insertions, 10 deletions

diff --git a/modules/processing.py b/modules/processing.py
index a56915c5..98e83c69 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -558,6 +558,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
     if type(p) == StableDiffusionProcessingTxt2Img:

         if p.enable_hr and p.hr_prompt != '':

             _, hr_extra_network_data = extra_networks.parse_prompts(p.all_hr_prompts[0:1])

+            extra_network_data.update(hr_extra_network_data)

 

 

     if p.scripts is not None:

@@ -598,11 +599,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
                 sd_vae_approx.model()

 

             if not p.disable_extra_networks:

-                if type(p) == StableDiffusionProcessingTxt2Img:

-                    if p.enable_hr and p.hr_prompt != '':

-                        extra_networks.activate(p, extra_network_data | hr_extra_network_data)

-                else:

-                    extra_networks.activate(p, extra_network_data)

+                extra_networks.activate(p, extra_network_data)

 

         with open(os.path.join(paths.data_path, "params.txt"), "w", encoding="utf8") as file:

             processed = Processed(p, [], p.seed, "")

@@ -753,11 +750,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
                 images.save_image(grid, p.outpath_grids, "grid", p.all_seeds[0], p.all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p, grid=True)

 

     if not p.disable_extra_networks:

-        if type(p) == StableDiffusionProcessingTxt2Img:

-            if p.enable_hr and p.hr_prompt != '':

-                extra_networks.deactivate(p, extra_network_data | hr_extra_network_data)

-        else:

-            extra_networks.deactivate(p, extra_network_data)

+        extra_networks.deactivate(p, extra_network_data)

 

     devices.torch_gc()