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

Move Anim_Setup module into Blender_Kitsu #5

Merged
Nick Alberelli merged 27 commits from :feature/merge_anim_setup_into_blender_kitsu into master 2023-04-05 17:38:41 +02:00
Conversation 0 Commits 27 Files Changed 22 +9 -1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f17de25a56 - Show all commits

7
blender_kitsu/prefs.py
View File

@ -316,6 +316,12 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences):
) )
edit_export_frame_offset: bpy.props.IntProperty( # type: ignore
name="Editorial Export Offset",
description="Shift Editorial Export by this frame-range after set-up.",
default=-102, #HARD CODED FOR PET PROJECTS BLENDER FILM
)
shot_builder_frame_offset: bpy.props.IntProperty( # type: ignore shot_builder_frame_offset: bpy.props.IntProperty( # type: ignore
name="Start Frame Offset", name="Start Frame Offset",
description="All Shots built by 'Shot_builder' should begin at this frame", description="All Shots built by 'Shot_builder' should begin at this frame",
@ -424,6 +430,7 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences):
box.label(text="Shot Builder", icon="MOD_BUILD") box.label(text="Shot Builder", icon="MOD_BUILD")
box.row().prop(self, "edit_export_dir") box.row().prop(self, "edit_export_dir")
box.row().prop(self, "edit_export_file_pattern") box.row().prop(self, "edit_export_file_pattern")
box.row().prop(self, "edit_export_frame_offset")
box.row().prop(self, "shot_builder_show_advanced") box.row().prop(self, "shot_builder_show_advanced")
if self.shot_builder_show_advanced: if self.shot_builder_show_advanced:
start_frame_row = box.row() start_frame_row = box.row()

3
blender_kitsu/shot_builder/editorial/core.py
View File

@ -41,10 +41,11 @@ def editorial_export_get_latest(context:bpy.types.Context, shot) -> list[bpy.typ
frame_in = shot["data"].get("frame_in") frame_in = shot["data"].get("frame_in")
frame_3d_in = shot["data"].get("3d_in") frame_3d_in = shot["data"].get("3d_in")
frame_3d_offset = frame_3d_in - addon_prefs.shot_builder_frame_offset frame_3d_offset = frame_3d_in - addon_prefs.shot_builder_frame_offset
edit_export_offset = addon_prefs.edit_export_frame_offset
# Set sequence strip start kitsu data. # Set sequence strip start kitsu data.
for strip in new_strips: for strip in new_strips:
strip.frame_start = -frame_in + (strip_frame_start * 2) + frame_3d_offset strip.frame_start = -frame_in + (strip_frame_start * 2) + frame_3d_offset + edit_export_offset
return new_strips return new_strips