1580158
/
sd-webui-deforum
mirror of https://github.com/deforum-art/deforum-for-automatic1111-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/420

pull/420/head
hithereai 2023-03-05 21:16:11 +02:00
parent 46577bd3aa b60d999202
commit 4e9a2a5ef0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/deforum.py
View File

@ -105,7 +105,7 @@ def run_deforum(*args, **kwargs):
need_to_frame_interpolate = True need_to_frame_interpolate = True
if video_args.skip_video_for_run_all: if video_args.skip_video_for_run_all:
print('Skipping video creation, uncheck skip_video_for_run_all if you want to run it') print("\nSkipping video creation, uncheck 'Skip video for run all' in 'Output' tab if you want to get a video too :)")
else: else:
import subprocess import subprocess

6
scripts/deforum_helpers/generate.py
View File

@ -136,7 +136,9 @@ def generate(args, keys, anim_args, loop_args, controlnet_args, root, frame = 0,
} }
if sampler_name is not None: if sampler_name is not None:
if sampler_name in available_samplers.keys(): if sampler_name in available_samplers.keys():
args.sampler = available_samplers[sampler_name] p.sampler_name = available_samplers[sampler_name]
else:
raise RuntimeError(f"Sampler name '{sampler_name}' is invalid. Please check the available sampler list in the 'Run' tab")
if args.checkpoint is not None: if args.checkpoint is not None:
info = sd_models.get_closet_checkpoint_match(args.checkpoint) info = sd_models.get_closet_checkpoint_match(args.checkpoint)
@ -254,7 +256,7 @@ def print_combined_table(args, anim_args, p, keys, frame_idx):
rows1.append(f"{p.denoising_strength:.5g}" if p.denoising_strength is not None else "None") rows1.append(f"{p.denoising_strength:.5g}" if p.denoising_strength is not None else "None")
rows1 += [str(p.subseed), f"{p.subseed_strength:.5g}"] * (anim_args.enable_subseed_scheduling) rows1 += [str(p.subseed), f"{p.subseed_strength:.5g}"] * (anim_args.enable_subseed_scheduling)
rows1 += [args.sampler] * anim_args.enable_sampler_scheduling rows1 += [p.sampler_name] * anim_args.enable_sampler_scheduling
rows1 += [str(args.checkpoint)] * anim_args.enable_checkpoint_scheduling rows1 += [str(args.checkpoint)] * anim_args.enable_checkpoint_scheduling
rows2 = [] rows2 = []