aboutsummaryrefslogtreecommitdiffstats
path: root/modules/processing.py
diff options
context:
space:
mode:
authorParityError <36368048+ParityError@users.noreply.github.com>2023-03-17 07:36:17 +0000
committerGitHub <noreply@github.com>2023-03-17 07:36:17 +0000
commit34c0f499c540f69a6de11caa940483e8f581074d (patch)
treea3d77fc1a626b372305b8f7220617f1ed97afc21 /modules/processing.py
parent5c051c0618bec1417827910b601ba915d0ca6c4e (diff)
parenta9fed7c364061ae6efb37f797b6b522cb3cf7aa2 (diff)
downloadstable-diffusion-webui-gfx803-34c0f499c540f69a6de11caa940483e8f581074d.tar.gz
stable-diffusion-webui-gfx803-34c0f499c540f69a6de11caa940483e8f581074d.tar.bz2
stable-diffusion-webui-gfx803-34c0f499c540f69a6de11caa940483e8f581074d.zip
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/processing.py')
-rw-r--r--modules/processing.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/processing.py b/modules/processing.py
index 06e7a440..59717b4c 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -583,6 +583,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if state.job_count == -1:
state.job_count = p.n_iter
+ extra_network_data = None
for n in range(p.n_iter):
p.iteration = n
@@ -712,7 +713,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if opts.grid_save:
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 not p.disable_extra_networks and extra_network_data:
extra_networks.deactivate(p, extra_network_data)
devices.torch_gc()