Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern
This commit is contained in:
commit
80c418c0d3
|
@ -127,7 +127,7 @@ class VanillaStableDiffusionSampler:
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def initialize(self, p):
|
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']:
|
for fieldname in ['p_sample_ddim', 'p_sample_plms']:
|
||||||
if hasattr(self.sampler, fieldname):
|
if hasattr(self.sampler, fieldname):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user