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

Blender Kitsu: Rename 'Render Thumbnail' to 'Render Still' #86

Merged
Nick Alberelli merged 1 commits from fix/render-still-from-edit into main 2023-06-19 13:06:57 +02:00
Conversation 0 Commits 1 Files Changed 2 +15 -23
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 05a39416e8 - Show all commits

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

@ -1097,13 +1097,13 @@ class KITSU_OT_sqe_set_sqe_render_task_type(bpy.types.Operator):
return {"FINISHED"} return {"FINISHED"}
class KITSU_OT_sqe_push_thumbnail(bpy.types.Operator): class KITSU_OT_sqe_push_render_still(bpy.types.Operator):
bl_idname = "kitsu.sqe_push_thumbnail" bl_idname = "kitsu.seq_render_still"
bl_label = "Push Thumbnail" bl_label = "Push Still"
bl_options = {"INTERNAL"} bl_options = {"INTERNAL"}
bl_description = ( bl_description = (
"Makes and saves one thumbnail for each shot. " "Makes and saves one still for each shot. "
"Uploads each thumbnail to server under the selected task type" "Uploads each still to server as a preview image for the selected task type"
) )
@classmethod @classmethod
@ -1290,7 +1290,7 @@ class KITSU_OT_sqe_push_render(bpy.types.Operator):
bl_options = {"INTERNAL"} bl_options = {"INTERNAL"}
bl_description = ( bl_description = (
"Makes and saves a .mp4 for each shot. " "Makes and saves a .mp4 for each shot. "
"Uploads each render on server under the selected task type" "Uploads each render on server as a preview image for the selected task type"
) )
@classmethod @classmethod
@ -2559,7 +2559,7 @@ classes = [
KITSU_OT_sqe_link_sequence, KITSU_OT_sqe_link_sequence,
KITSU_OT_sqe_set_thumbnail_task_type, KITSU_OT_sqe_set_thumbnail_task_type,
KITSU_OT_sqe_set_sqe_render_task_type, KITSU_OT_sqe_set_sqe_render_task_type,
KITSU_OT_sqe_push_thumbnail, KITSU_OT_sqe_push_render_still,
KITSU_OT_sqe_push_render, KITSU_OT_sqe_push_render,
KITSU_OT_sqe_push_shot, KITSU_OT_sqe_push_shot,
KITSU_OT_sqe_push_del_shot, KITSU_OT_sqe_push_del_shot,

24
scripts-blender/addons/blender_kitsu/sqe/ui.py
View File

@ -34,7 +34,7 @@ from blender_kitsu.sqe.ops import (
KITSU_OT_sqe_link_sequence, KITSU_OT_sqe_link_sequence,
KITSU_OT_sqe_set_thumbnail_task_type, KITSU_OT_sqe_set_thumbnail_task_type,
KITSU_OT_sqe_set_sqe_render_task_type, KITSU_OT_sqe_set_sqe_render_task_type,
KITSU_OT_sqe_push_thumbnail, KITSU_OT_sqe_push_render_still,
KITSU_OT_sqe_push_render, KITSU_OT_sqe_push_render,
KITSU_OT_sqe_push_del_shot, KITSU_OT_sqe_push_del_shot,
KITSU_OT_sqe_pull_shot_meta, KITSU_OT_sqe_pull_shot_meta,
@ -68,7 +68,6 @@ class KITSU_MT_sqe_advanced_delete(bpy.types.Menu):
bl_label = "Advanced Delete" bl_label = "Advanced Delete"
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None:
selshots = context.selected_sequences selshots = context.selected_sequences
strips_to_unlink = [s for s in selshots if s.kitsu.linked] strips_to_unlink = [s for s in selshots if s.kitsu.linked]
@ -97,12 +96,9 @@ class KITSU_PT_sqe_shot_tools(bpy.types.Panel):
@classmethod @classmethod
def poll(cls, context: bpy.types.Context) -> bool: def poll(cls, context: bpy.types.Context) -> bool:
sqe = context.scene.sequence_editor sqe = context.scene.sequence_editor
return bool( return bool(prefs.session_auth(context) or (sqe and sqe.sequences_all))
prefs.session_auth(context) or (sqe and sqe.sequences_all)
)
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None:
if self.poll_error(context): if self.poll_error(context):
self.draw_error(context) self.draw_error(context)
@ -216,7 +212,6 @@ class KITSU_PT_sqe_shot_tools(bpy.types.Panel):
# Unlink. # Unlink.
elif strip.kitsu.linked: elif strip.kitsu.linked:
row = box.row(align=True) row = box.row(align=True)
row.operator( row.operator(
KITSU_OT_sqe_unlink_shot.bl_idname, KITSU_OT_sqe_unlink_shot.bl_idname,
@ -404,7 +399,6 @@ class KITSU_PT_sqe_shot_tools(bpy.types.Panel):
row.prop(context.window_manager, "show_advanced", text="") row.prop(context.window_manager, "show_advanced", text="")
if context.window_manager.show_advanced: if context.window_manager.show_advanced:
# Counter. # Counter.
box.row().prop( box.row().prop(
addon_prefs, "shot_counter_digits", text="Shot Counter Digits" addon_prefs, "shot_counter_digits", text="Shot Counter Digits"
@ -532,13 +526,12 @@ class KITSU_PT_sqe_shot_tools(bpy.types.Panel):
# Thumbnail and seqeunce renderoperator. # Thumbnail and seqeunce renderoperator.
if strips_to_tb: if strips_to_tb:
# Upload thumbnail op. # Upload thumbnail op.
noun = get_selshots_noun(len(strips_to_tb), prefix=f"{len(strips_to_meta)}") noun = get_selshots_noun(len(strips_to_tb), prefix=f"{len(strips_to_meta)}")
split = col.split(factor=0.7, align=True) split = col.split(factor=0.7, align=True)
split.operator( split.operator(
KITSU_OT_sqe_push_thumbnail.bl_idname, KITSU_OT_sqe_push_render_still.bl_idname,
text=f"Thumbnail {noun}", text=f"Render Still {noun}",
icon="IMAGE_DATA", icon="IMAGE_DATA",
) )
# Select task types op. # Select task types op.
@ -554,7 +547,7 @@ class KITSU_PT_sqe_shot_tools(bpy.types.Panel):
split = col.split(factor=0.7, align=True) split = col.split(factor=0.7, align=True)
split.operator( split.operator(
KITSU_OT_sqe_push_render.bl_idname, KITSU_OT_sqe_push_render.bl_idname,
text=f"Render {noun}", text=f"Render Movie {noun}",
icon="IMAGE_DATA", icon="IMAGE_DATA",
) )
# Select task types op. # Select task types op.
@ -696,7 +689,6 @@ class KITSU_PT_sqe_general_tools(bpy.types.Panel):
return bool(movie_strips) return bool(movie_strips)
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None:
active_strip = context.scene.sequence_editor.active_strip active_strip = context.scene.sequence_editor.active_strip
selshots = context.selected_sequences selshots = context.selected_sequences
if not selshots: if not selshots:
@ -735,6 +727,7 @@ class KITSU_PT_sqe_general_tools(bpy.types.Panel):
KITSU_OT_sqe_change_strip_source.bl_idname, text="", icon="FILE_PARENT" KITSU_OT_sqe_change_strip_source.bl_idname, text="", icon="FILE_PARENT"
).go_latest = True ).go_latest = True
class KITSU_PT_edit_task(bpy.types.Panel): class KITSU_PT_edit_task(bpy.types.Panel):
bl_category = "Kitsu" bl_category = "Kitsu"
bl_label = "Edit Tasks" bl_label = "Edit Tasks"
@ -744,8 +737,7 @@ class KITSU_PT_edit_task(bpy.types.Panel):
def draw(self, context: bpy.types.Context) -> None: def draw(self, context: bpy.types.Context) -> None:
self.layout.operator("kitsu.vse_publish_edit_revision") self.layout.operator("kitsu.vse_publish_edit_revision")
# ---------REGISTER ----------. # ---------REGISTER ----------.
@ -753,7 +745,7 @@ classes = [
KITSU_MT_sqe_advanced_delete, KITSU_MT_sqe_advanced_delete,
KITSU_PT_sqe_shot_tools, KITSU_PT_sqe_shot_tools,
KITSU_PT_sqe_general_tools, KITSU_PT_sqe_general_tools,
KITSU_PT_edit_task KITSU_PT_edit_task,
] ]