From c9904db37c4e2d55c1cfed8fd671f4e4c9603828 Mon Sep 17 00:00:00 2001 From: kabachuha Date: Sun, 12 Feb 2023 23:29:39 +0300 Subject: [PATCH] fixup the rest of merge errors --- scripts/deforum_helpers/generate.py | 3 +-- scripts/deforum_helpers/render.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/deforum_helpers/generate.py b/scripts/deforum_helpers/generate.py index a4da3667..a539fe86 100644 --- a/scripts/deforum_helpers/generate.py +++ b/scripts/deforum_helpers/generate.py @@ -174,8 +174,7 @@ def generate(args, anim_args, loop_args, root, frame = 0, return_sample=False, s mask = prepare_mask(mask_image, (args.W, args.H), args.mask_contrast_adjust, - args.mask_brightness_adjust, - invert_mask=False) + args.mask_brightness_adjust) # 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) diff --git a/scripts/deforum_helpers/render.py b/scripts/deforum_helpers/render.py index 7900dc3d..896a324d 100644 --- a/scripts/deforum_helpers/render.py +++ b/scripts/deforum_helpers/render.py @@ -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) 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: - 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 if tween_frame_idx > 0: