Merge remote-tracking branch 'upstream/master' into sub-quad_attn_opt

1 files changed, 6 insertions, 3 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 4baf4d9a..12a9de3d 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -212,11 +212,10 @@ def restore_old_hires_fix_params(res):
         firstpass_width = math.ceil(scale * width / 64) * 64

         firstpass_height = math.ceil(scale * height / 64) * 64

 

-    hr_scale = width / firstpass_width if firstpass_width > 0 else height / firstpass_height

-

     res['Size-1'] = firstpass_width

     res['Size-2'] = firstpass_height

-    res['Hires upscale'] = hr_scale

+    res['Hires resize-1'] = width

+    res['Hires resize-2'] = height

 

 

 def parse_generation_parameters(x: str):

@@ -276,6 +275,10 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         hypernet_hash = res.get("Hypernet hash", None)

         res["Hypernet"] = find_hypernetwork_key(hypernet_name, hypernet_hash)

 

+    if "Hires resize-1" not in res:

+        res["Hires resize-1"] = 0

+        res["Hires resize-2"] = 0

+

     restore_old_hires_fix_params(res)

 

     return res