diff options
author | AUTOMATIC <16777216c@gmail.com> | 2022-10-03 05:54:06 +0000 |
---|---|---|
committer | AUTOMATIC <16777216c@gmail.com> | 2022-10-03 05:54:06 +0000 |
commit | d15c125db7f9c153aaf613ad5c3522d0142a36b2 (patch) | |
tree | 5305b5979407ac36ed053a2812ca9d8793c30f23 | |
parent | 6491b09c24ea77f1f69990ea80a216f9ce319589 (diff) | |
parent | 34c638142eaa57f89b86545ba3c72085036398bb (diff) | |
download | stable-diffusion-webui-gfx803-d15c125db7f9c153aaf613ad5c3522d0142a36b2.tar.gz stable-diffusion-webui-gfx803-d15c125db7f9c153aaf613ad5c3522d0142a36b2.tar.bz2 stable-diffusion-webui-gfx803-d15c125db7f9c153aaf613ad5c3522d0142a36b2.zip |
Merge remote-tracking branch 'origin/master'
-rw-r--r-- | javascript/hints.js | 2 | ||||
-rw-r--r-- | modules/sd_samplers.py | 2 | ||||
-rw-r--r-- | modules/ui.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/javascript/hints.js b/javascript/hints.js index 84694eeb..e72e9338 100644 --- a/javascript/hints.js +++ b/javascript/hints.js @@ -15,7 +15,7 @@ titles = { "\u267b\ufe0f": "Reuse seed from last generation, mostly useful if it was randomed", "\u{1f3a8}": "Add a random artist to the prompt.", "\u2199\ufe0f": "Read generation parameters from prompt into user interface.", - "\uD83D\uDCC2": "Open images output directory", + "\u{1f4c2}": "Open images output directory", "Inpaint a part of image": "Draw a mask over an image, and the script will regenerate the masked area with content according to prompt", "SD upscale": "Upscale image normally, split result into tiles, improve each tile using img2img, merge whole image back", diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index 9316875a..dbf570d2 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -127,7 +127,7 @@ class VanillaStableDiffusionSampler: return res
def initialize(self, p):
- self.eta = p.eta or opts.eta_ddim
+ self.eta = p.eta if p.eta is not None else opts.eta_ddim
for fieldname in ['p_sample_ddim', 'p_sample_plms']:
if hasattr(self.sampler, fieldname):
diff --git a/modules/ui.py b/modules/ui.py index d9d02ece..16432151 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -69,7 +69,7 @@ random_symbol = '\U0001f3b2\ufe0f' # 🎲️ reuse_symbol = '\u267b\ufe0f' # ♻️
art_symbol = '\U0001f3a8' # 🎨
paste_symbol = '\u2199\ufe0f' # ↙
-folder_symbol = '\uD83D\uDCC2'
+folder_symbol = '\U0001f4c2' # 📂
def plaintext_to_html(text):
text = "<p>" + "<br>\n".join([f"{html.escape(x)}" for x in text.split('\n')]) + "</p>"
|