aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRnDMonkey <RnDMonkey@users.noreply.github.com>2022-10-03 05:22:14 +0000
committerGitHub <noreply@github.com>2022-10-03 05:22:14 +0000
commit80c418c0d3f81c64ae8e620f020998d8b1c4c3d7 (patch)
treec3694ba0693cb485679829e9f6d1d3b41d1099f3
parent36ea4ac0f5844e5c8dec124edbdb714ccdd6013c (diff)
parent34c638142eaa57f89b86545ba3c72085036398bb (diff)
downloadstable-diffusion-webui-gfx803-80c418c0d3f81c64ae8e620f020998d8b1c4c3d7.tar.gz
stable-diffusion-webui-gfx803-80c418c0d3f81c64ae8e620f020998d8b1c4c3d7.tar.bz2
stable-diffusion-webui-gfx803-80c418c0d3f81c64ae8e620f020998d8b1c4c3d7.zip
Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern
-rw-r--r--modules/sd_samplers.py2
1 files changed, 1 insertions, 1 deletions
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):