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

fixup the rest of merge errors

pull/176/head
kabachuha 2023-02-12 23:29:39 +03:00
parent cad7e49044
commit c9904db37c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/deforum_helpers/generate.py
View File

@ -174,8 +174,7 @@ def generate(args, anim_args, loop_args, root, frame = 0, return_sample=False, s
mask = prepare_mask(mask_image, mask = prepare_mask(mask_image,
(args.W, args.H), (args.W, args.H),
args.mask_contrast_adjust, args.mask_contrast_adjust,
args.mask_brightness_adjust, args.mask_brightness_adjust)
invert_mask=False)
# HACK: this is a hacky check to make the mask work with the new inpainting code # HACK: this is a hacky check to make the mask work with the new inpainting code
crop_region = masking.get_crop_region(np.array(mask_image), args.full_res_mask_padding) crop_region = masking.get_crop_region(np.array(mask_image), args.full_res_mask_padding)

4
scripts/deforum_helpers/render.py
View File

@ -220,9 +220,9 @@ def render_animation(args, anim_args, video_args, parseq_args, loop_args, animat
depth = depth_model.predict(turbo_next_image, anim_args, root.half_precision) depth = depth_model.predict(turbo_next_image, anim_args, root.half_precision)
if advance_prev: if advance_prev:
turbo_prev_image, _ = anim_frame_warp(turbo_prev_image, args, anim_args, keys, tween_frame_idx, depth_model, depth=depth, device=root.device, half_precision=root.half_precision) turbo_prev_image, _, _ = anim_frame_warp(turbo_prev_image, args, anim_args, keys, tween_frame_idx, depth_model, depth=depth, device=root.device, half_precision=root.half_precision)
if advance_next: if advance_next:
turbo_next_image, _ = anim_frame_warp(turbo_next_image, args, anim_args, keys, tween_frame_idx, depth_model, depth=depth, device=root.device, half_precision=root.half_precision) turbo_next_image, _, _ = anim_frame_warp(turbo_next_image, args, anim_args, keys, tween_frame_idx, depth_model, depth=depth, device=root.device, half_precision=root.half_precision)
# hybrid video motion - warps turbo_prev_image or turbo_next_image to match motion # hybrid video motion - warps turbo_prev_image or turbo_next_image to match motion
if tween_frame_idx > 0: if tween_frame_idx > 0: