studio/blender-studio-tools
13
32
Fork 19
Code Issues 20 Pull Requests 4 Projects Releases 1 Activity

Blender Kitsu: fix pull edit for episodic workflow and shot starting on frame 0 #211

Merged
Nick Alberelli merged 1 commits from slumber/blender-studio-pipeline:fix-pull-edit-for-episodic-workflow into main 2024-01-24 14:47:23 +01:00
Conversation 1 Commits 1 Files Changed 1 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts-blender/addons/blender_kitsu/sqe/ops.py
View File

@ -1708,7 +1708,8 @@ class KITSU_OT_sqe_pull_edit(bpy.types.Operator):
existing = [] existing = []
channel = context.scene.kitsu.pull_edit_channel channel = context.scene.kitsu.pull_edit_channel
active_project = cache.project_active_get() active_project = cache.project_active_get()
sequences = active_project.get_sequences_all() active_episode = cache.episode_active_get()
sequences = active_episode.get_sequences_all() if active_episode else active_project.get_sequences_all()
shot_strips = checksqe.get_shot_strips(context) shot_strips = checksqe.get_shot_strips(context)
occupied_ranges = checksqe.get_occupied_ranges(context) occupied_ranges = checksqe.get_occupied_ranges(context)
all_shots = active_project.get_shots_all() all_shots = active_project.get_shots_all()
@ -1744,11 +1745,11 @@ class KITSU_OT_sqe_pull_edit(bpy.types.Operator):
continue continue
# Get frame range information. # Get frame range information.
frame_start = shot.data["frame_in"] frame_start = shot.data.get("frame_in", None)
frame_end = shot.data["frame_out"] frame_end = shot.data.get("frame_out", None)
# Continue if frame range information is missing. # Continue if frame range information is missing.
if not frame_start or not frame_end: if frame_start is None or frame_end is None:
failed.append(shot) failed.append(shot)
logger.error( logger.error(
"Failed to create shot %s. Missing frame range information", "Failed to create shot %s. Missing frame range information",