[Blender_Kitsu] Add Operators to cleanup Animation Files #38

Merged
Nick Alberelli merged 12 commits from feature/enforce_naming into main 2023-05-09 17:12:20 +02:00
2 changed files with 65 additions and 32 deletions
Showing only changes of commit e51f720524 - Show all commits

View File

@ -52,7 +52,6 @@ class KITSU_OT_anim_quick_duplicate(bpy.types.Operator):
)
def execute(self, context: bpy.types.Context) -> Set[str]:
act_coll = context.view_layer.active_layer_collection.collection
shot_active = cache.shot_active_get()
amount = context.window_manager.kitsu.quick_duplicate_amount
@ -127,10 +126,10 @@ class KITSU_OT_anim_check_action_names(bpy.types.Operator):
for obj in [obj for obj in bpy.data.objects if obj.type == "ARMATURE"]:
# Cerate Action if None Exists
if obj.animation_data is None or obj.animation_data.action is None:
base_name = obj.name.split(
addon_prefs.shot_builder_armature_prefix)[-1]
base_name = obj.name.split(addon_prefs.shot_builder_armature_prefix)[-1]
new_action = bpy.data.actions.new(
f"{addon_prefs.shot_builder_action_prefix}{base_name}.{active_shot.name}.v001")
f"{addon_prefs.shot_builder_action_prefix}{base_name}.{active_shot.name}.v001"
)
new_action.use_fake_user = True
obj.animation_data_create()
obj.animation_data.action = new_action
@ -248,17 +247,26 @@ class KITSU_OT_anim_check_action_names(bpy.types.Operator):
row.label(text="", icon="FORWARD")
row.label(text=name)
class KITSU_OT_anim_enforce_naming_convention(bpy.types.Operator):
bl_idname = "kitsu.anim_enforce_naming_convention"
bl_label = "Set Name Conventions"
bl_options = {"REGISTER", "UNDO"}
bl_description = ("Fix Naming of Scene, Output Collection, Actions, and optionally F`ind and Replace`.")
bl_description = "Fix Naming of Scene, Output Collection, Actions, and optionally Find and remove a given string"
remove_str: bpy.props.StringProperty(name="Find and Replace", default="",)
remove_str: bpy.props.StringProperty(
name="Find and Replace",
default="",
)
rename_scene: bpy.props.BoolProperty(name="Rename Scene", default=True)
rename_output_col: bpy.props.BoolProperty(name="Rename Output Collection", default=True)
find_replace: bpy.props.BoolProperty(name="Find and Replace", default=False)
rename_output_col: bpy.props.BoolProperty(
name="Rename Output Collection", default=True
)
find_replace: bpy.props.BoolProperty(
name="Find and Remove",
default=False,
description="Remove this string from Collection, Object and Object Data names. Used to remove suffixes from file names such as '.001'",
)
def invoke(self, context, event):
return context.window_manager.invoke_props_dialog(self, width=500)
@ -272,16 +280,16 @@ class KITSU_OT_anim_enforce_naming_convention(bpy.types.Operator):
if self.find_replace:
layout.prop(self, "remove_str")
def rename_datablock(self, data_block, replace:str):
def rename_datablock(self, data_block, replace: str):
# Return Early if data_block is linked but not overriden
if data_block is None or data_block.library is not None:
return
if replace in data_block.name:
data_block.name = data_block.name.replace(replace,"")
return (data_block.name)
data_block.name = data_block.name.replace(replace, "")
return data_block.name
def execute(self, context:bpy.types.Context):
shot_base_name = bpy.path.basename(bpy.data.filepath).replace(".anim.blend","")
def execute(self, context: bpy.types.Context):
shot_base_name = bpy.path.basename(bpy.data.filepath).replace(".anim.blend", "")
scene_col = context.scene.collection
anim_suffix = "anim.output"
@ -293,7 +301,11 @@ class KITSU_OT_anim_enforce_naming_convention(bpy.types.Operator):
self.rename_datablock(obj.data, self.remove_str)
if self.rename_output_col:
output_cols = [col for col in context.scene.collection.children_recursive if anim_suffix in col.name]
output_cols = [
col
for col in context.scene.collection.children_recursive
if anim_suffix in col.name
]
if len(output_cols) != 1:
self.report(
{"INFO"},
@ -314,19 +326,44 @@ class KITSU_OT_anim_enforce_naming_convention(bpy.types.Operator):
)
return {"FINISHED"}
class KITSU_OT_remove_override_hidden_collections(bpy.types.Operator):
bl_idname = "kitsu.remove_override_hidden_collections"
bl_label = "Cleanup Override Collections"
class KITSU_OT_unlink_collection_with_string(bpy.types.Operator):
bl_idname = "kitsu.unlink_collection_with_string"
bl_label = "Find and Unlink Collections"
bl_options = {"REGISTER", "UNDO"}
bl_description = ("Unlink any Collection with Name 'OVERRIDE_HIDDEN' from current scene")
bl_description = (
"Unlink any Collection with a given name. By default name is 'OVERRIDE_HIDDEN'"
)
remove_collection_string: bpy.props.StringProperty(
name="Find in Name",
default='OVERRIDE_HIDDEN',
description="Search for this string withing current scene's collections. Collection will be unlinked if it matches given string'",
)
def invoke(self, context, event):
return context.window_manager.invoke_props_dialog(self, width=500)
def draw(self, context):
layout = self.layout
layout.prop(self, "remove_collection_string")
def execute(self, context):
remove_name = 'OVERRIDE_HIDDEN'
scene_cols = context.scene.collection.children
cols = [col for col in scene_cols if remove_name in col.name]
cols = [col for col in scene_cols if self.remove_collection_string in col.name]
cleaned = False
for col in cols:
cleaned = True
scene_cols.unlink(col)
self.report({"INFO"}, f"Removed Collection '{col.name}'",)
self.report(
{"INFO"},
f"Removed Collection '{col.name}'",
)
if not cleaned:
self.report(
{"INFO"},
f"No Collections found containing name '{self.remove_collection_string}'",
)
return {"FINISHED"}
@ -359,12 +396,10 @@ class KITSU_OT_anim_update_output_coll(bpy.types.Operator):
output_coll.children.unlink(collection)
bpy.context.view_layer.update()
asset_colls = opsdata.find_asset_collections_in_scene(context.scene)
missing: List[bpy.types.Collection] = []
output_coll_childs = list(opsdata.traverse_collection_tree(output_coll))
# Check if all found asset colls are in output coll.
for coll in asset_colls:
if coll in output_coll_childs:
@ -389,7 +424,9 @@ class KITSU_OT_anim_update_output_coll(bpy.types.Operator):
# Ensure Camera Rig is Linked
for coll in [col for col in bpy.data.collections]:
if coll.override_library:
if coll.override_library.hierarchy_root.name == "CA-camera_rig": #TODO Fix this hack to be generic
if (
coll.override_library.hierarchy_root.name == "CA-camera_rig"
): # TODO Fix this hack to be generic
output_coll.children.link(coll)
self.report(
@ -406,7 +443,7 @@ classes = [
KITSU_OT_anim_check_action_names,
KITSU_OT_anim_update_output_coll,
KITSU_OT_anim_enforce_naming_convention,
KITSU_OT_remove_override_hidden_collections
KITSU_OT_unlink_collection_with_string,
]

View File

@ -100,10 +100,6 @@ class KITSU_PT_vi3d_anim_tools(bpy.types.Panel):
row = box.row(align=True)
row.operator("kitsu.anim_enforce_naming_convention", icon="SORTALPHA")
row = box.row(align=True)
row.operator("kitsu.remove_override_hidden_collections", icon="OUTLINER_COLLECTION")
# ---------REGISTER ----------.