Commit 80c418c0 authored by RnDMonkey's avatar RnDMonkey Committed by GitHub

Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern

parents 36ea4ac0 34c63814
......@@ -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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment