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 +26 -5
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5746a6316 - Show all commits

23
blender_kitsu/prefs.py
View File

@ -272,6 +272,10 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences):
name="Show Advanced Settings", name="Show Advanced Settings",
description="Show advanced settings that should already have good defaults", description="Show advanced settings that should already have good defaults",
) )
shot_builder_show_advanced : bpy.props.BoolProperty( # type: ignore
name="Show Advanced Settings",
description="Show advanced settings that should already have good defaults",
)
shot_pattern: bpy.props.StringProperty( # type: ignore shot_pattern: bpy.props.StringProperty( # type: ignore
name="Shot Pattern", name="Shot Pattern",
@ -332,6 +336,12 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences):
update=init_editoral_export_directory, update=init_editoral_export_directory,
) )
shot_builder_frame_offset: bpy.props.IntProperty( # type: ignore
name="Start Frame Offset",
description="All Shots built by 'Shot_builder' should begin at this frame",
default=101,
)
session: Session = Session() session: Session = Session()
tasks: bpy.props.CollectionProperty(type=KITSU_task) tasks: bpy.props.CollectionProperty(type=KITSU_task)
@ -410,7 +420,18 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences):
icon="ADD", icon="ADD",
emboss=False, emboss=False,
) )
# Shot_Builder settings.
box = layout.box()
box.label(text="Shot Builder", icon="MOD_BUILD")
box.row().prop(self, "edit_export_dir")
box.row().prop(self, "edit_export_file_pattern")
box.row().prop(self, "shot_builder_show_advanced")
if self.shot_builder_show_advanced:
start_frame_row = box.row()
start_frame_row.label(text="Start Frame Offset")
start_frame_row.prop(self, "shot_builder_frame_offset", text="")
# Misc settings. # Misc settings.
box = layout.box() box = layout.box()
box.label(text="Miscellaneous", icon="MODIFIER") box.label(text="Miscellaneous", icon="MODIFIER")

8
blender_kitsu/shot_builder/operators.py
View File

@ -177,10 +177,10 @@ class SHOTBUILDER_OT_NewShotFile(bpy.types.Operator):
action.use_fake_user = True action.use_fake_user = True
obj.animation_data.action = action obj.animation_data.action = action
# Set Shot Frame Range # Set Shot Frame Range
start_frame_offset = 101 #TODO EXPOSE INT IN ADDON PREFERENCES context.scene.frame_start = addon_prefs.shot_builder_frame_offset
context.scene.frame_start = start_frame_offset context.scene.frame_end = shot.nb_frames + addon_prefs.shot_builder_frame_offset
context.scene.frame_end = shot.nb_frames + start_frame_offset
return {'FINISHED'} return {'FINISHED'}
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None: