Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions fast64_internal/z64/animation/operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,14 @@ def ootImportAnimationC(
basePath,
f"{bpy.context.scene.fast64.oot.get_extracted_path()}/assets/misc/link_animetion/link_animetion.c",
)
animHeaderFilepath = os.path.join(
basePath,
f"{bpy.context.scene.fast64.oot.get_extracted_path()}/assets/objects/gameplay_keep/gameplay_keep.c",
)

# starting with zeldaret/oot dbe1a80541173652c344f20226310a8bf90f3086 gameplay_keep is split and committed
animHeaderFilepath = f"{basePath}/assets/objects/gameplay_keep/player_anim_headers.c"
if not os.path.exists(animHeaderFilepath):
animHeaderFilepath = os.path.join(
basePath,
f"{bpy.context.scene.fast64.oot.get_extracted_path()}/assets/objects/gameplay_keep/gameplay_keep.c",
)
else:
animFilepath = filepath
animHeaderFilepath = filepath
Expand Down
4 changes: 4 additions & 0 deletions fast64_internal/z64/skeleton/importer/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ def ootImportSkeletonC(basePath: str, importSettings: OOTSkeletonImportSettings)
filepaths.append(ootGetObjectPath(isCustomImport, "", "gameplay_keep", True))
filepaths.append(ootGetObjectHeaderPath(isCustomImport, "", "gameplay_keep", True))

# starting with zeldaret/oot dbe1a80541173652c344f20226310a8bf90f3086 gameplay_keep is split and committed
filepaths.append(f"{bpy.context.scene.ootDecompPath}/assets/objects/gameplay_keep/link_textures.c")
filepaths.append(f"{bpy.context.scene.ootDecompPath}/assets/objects/gameplay_keep/link_textures.h")

if (Path(bpy.context.scene.ootDecompPath) / "assets/objects" / folderName).exists():
filepaths.extend(
[
Expand Down