Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into upstream-master

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py
index c4396bb9..634fb4b2 100644
--- a/modules/sd_hijack_optimizations.py
+++ b/modules/sd_hijack_optimizations.py
@@ -28,7 +28,7 @@ def split_cross_attention_forward_v1(self, x, context=None, mask=None):
     q_in = self.to_q(x)

     context = default(context, x)

 

-    hypernetwork = shared.selected_hypernetwork()

+    hypernetwork = shared.loaded_hypernetwork

     hypernetwork_layers = (hypernetwork.layers if hypernetwork is not None else {}).get(context.shape[2], None)

 

     if hypernetwork_layers is not None:

@@ -68,7 +68,7 @@ def split_cross_attention_forward(self, x, context=None, mask=None):
     q_in = self.to_q(x)

     context = default(context, x)

 

-    hypernetwork = shared.selected_hypernetwork()

+    hypernetwork = shared.loaded_hypernetwork

     hypernetwork_layers = (hypernetwork.layers if hypernetwork is not None else {}).get(context.shape[2], None)

 

     if hypernetwork_layers is not None:

@@ -132,7 +132,7 @@ def xformers_attention_forward(self, x, context=None, mask=None):
     h = self.heads

     q_in = self.to_q(x)

     context = default(context, x)

-    hypernetwork = shared.selected_hypernetwork()

+    hypernetwork = shared.loaded_hypernetwork

     hypernetwork_layers = (hypernetwork.layers if hypernetwork is not None else {}).get(context.shape[2], None)

     if hypernetwork_layers is not None:

         k_in = self.to_k(hypernetwork_layers[0](context))