Skip to content

[bugfix] Animation action names include actor name in variable #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dragorn421 merged 1 commit into from
Aug 19, 2026
Merged

[bugfix] Animation action names include actor name in variable #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fast64_internal/sm64/animation/exporting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def to_animation_class(
values_reference, indice_reference = action_props.values_table, action_props.indices_table
else:
pairs = get_animation_pairs(blender_to_sm64_scale, [action], obj, quick_read)[action]
animation.data = to_data_class(pairs, action_props.get_name(action, dma), animation.file_name)
animation.data = to_data_class(pairs, action_props.get_name(actor_name, action, dma), animation.file_name)
values_reference = animation.data.values_reference
indice_reference = animation.data.indice_reference
bone_count = len(get_anim_owners(obj))
Expand Down Expand Up @@ -360,7 +360,7 @@ def to_table_element_class(
if action in action_pairs and action not in data_dict:
data_dict[action] = to_data_class(
action_pairs[action],
action_props.get_name(action, dma),
action_props.get_name(actor_name, action, dma),
action_props.get_file_name(action, export_type, dma),
)
data = data_dict[action]
Expand Down
4 changes: 2 additions & 2 deletions fast64_internal/sm64/animation/properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,10 @@ def headers(self) -> list[SM64_AnimHeaderProperties]:
def dma_name(self):
return get_dma_anim_name([header.table_index for header in self.headers])

def get_name(self, action: Action, dma=False) -> str:
def get_name(self, actor_name: str, action: Action, dma=False) -> str:
if dma:
return self.dma_name
return toAlnum(f"anim_{action.name}")
return toAlnum(f"{actor_name}_anim_{action.name}")

def get_file_name(self, action: Action, export_type: str, dma=False) -> str:
if not export_type in {"C", "Insertable Binary"}:
Expand Down