From adadeb2479e2103c33ca53024bf5746be1eaa29a Mon Sep 17 00:00:00 2001 From: Nick Alberelli Date: Wed, 26 Apr 2023 16:22:53 +0200 Subject: [PATCH] revert [Blender_Kitsu] Remove metastrip filepath (#15) revert [Blender_Kitsu] Remove metastrip filepath (#15) Closes: https://projects.blender.org/TinyNick/blender-studio-tools/issues/28 # Issue Addon uses a filepath to import a blank file that metastrip relies on. # Solution - [x] Create a blank movie file without a filepath - [x] Remove string property that contains metastrip filepath ### Old ![old_metastrip](/attachments/c35c64fc-d393-4d70-bc44-54bf819bd0c5) ### New ![new_metastrip](/attachments/1bed8f53-9157-421a-a6de-aea41662f171) Co-authored-by: TinyNick Reviewed-on: https://projects.blender.org/studio/blender-studio-tools/pulls/15 --- blender_kitsu/prefs.py | 13 +++++++++++++ blender_kitsu/sqe/ops.py | 18 ++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/blender_kitsu/prefs.py b/blender_kitsu/prefs.py index ec65119e..af504f39 100644 --- a/blender_kitsu/prefs.py +++ b/blender_kitsu/prefs.py @@ -154,6 +154,9 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences): return "" return self.project_root_path.joinpath("pipeline/blender_kitsu").as_posix() + def get_metastrip_file(self) -> str: + res_dir = bkglobals.RES_DIR_PATH + return res_dir.joinpath("metastrip.mp4").as_posix() def init_playblast_file_model(self, context: bpy.types.Context) -> None: ops_playblast_data.init_playblast_file_model(context) @@ -225,6 +228,16 @@ class KITSU_addon_preferences(bpy.types.AddonPreferences): get=get_config_dir, ) + metastrip_file: bpy.props.StringProperty( # type: ignore + name="Meta Strip File", + description=( + "Filepath to black .mp4 file that will be used as metastrip for shots in the sequence editor" + ), + default="", + subtype="FILE_PATH", + get=get_metastrip_file, + ) + project_active_id: bpy.props.StringProperty( # type: ignore name="Project Active ID", description="Server Id that refers to the last active project", diff --git a/blender_kitsu/sqe/ops.py b/blender_kitsu/sqe/ops.py index ed888b33..320a979c 100644 --- a/blender_kitsu/sqe/ops.py +++ b/blender_kitsu/sqe/ops.py @@ -1705,6 +1705,7 @@ class KITSU_OT_sqe_pull_edit(bpy.types.Operator): return bool( prefs.session_auth(context) and cache.project_active_get() + and addon_prefs.metastrip_file ) def execute(self, context: bpy.types.Context) -> Set[str]: @@ -1785,12 +1786,12 @@ class KITSU_OT_sqe_pull_edit(bpy.types.Operator): frame_end, ) continue - # TODO Refactor as this reuses code from KITSU_OT_sqe_create_meta_strip + if not strip: # Create new strip. strip = context.scene.sequence_editor.sequences.new_movie( shot.name, - "", + addon_prefs.metastrip_file, channel, frame_start, ) @@ -1974,7 +1975,8 @@ class KITSU_OT_sqe_create_meta_strip(bpy.types.Operator): @classmethod def poll(cls, context: bpy.types.Context) -> bool: - return bool(context.selected_sequences) + addon_prefs = prefs.addon_prefs_get(context) + return bool(context.selected_sequences and addon_prefs.metastrip_file) def execute(self, context: bpy.types.Context) -> Set[str]: addon_prefs = prefs.addon_prefs_get(context) @@ -1985,6 +1987,14 @@ class KITSU_OT_sqe_create_meta_strip(bpy.types.Operator): selected_sequences = context.selected_sequences + # Check if metastrip file actually exists. + if not Path(addon_prefs.metastrip_file).exists(): + self.report( + {"ERROR"}, + f"Failed to load metastrip file: {addon_prefs.metastrip_file}. Path does not exist", + ) + return {"CANCELLED"} + for strip in selected_sequences: # Get frame range information from current strip. @@ -2011,7 +2021,7 @@ class KITSU_OT_sqe_create_meta_strip(bpy.types.Operator): # on the first try, EDIT: seems to work maybe per python overlaps of sequences possible? meta_strip = context.scene.sequence_editor.sequences.new_movie( f"{strip.name}_metastrip", - "", + addon_prefs.metastrip_file, strip.channel + 1, strip.frame_final_start, ) -- 2.30.2