Skip to content

[OoT] Fix custom-path OoT/MM DL import not reading object header #714

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

Open
mike-r129 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −1
Open

[OoT] Fix custom-path OoT/MM DL import not reading object header #714

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: 3 additions & 1 deletion fast64_internal/z64/utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,9 @@ def ootGetObjectPath(isCustomExport: bool, exportPath: str, folderName: str, inc
def ootGetObjectHeaderPath(isCustomExport: bool, exportPath: str, folderName: str, include_extracted: bool) -> str:
extracted = bpy.context.scene.fast64.oot.get_extracted_path() if include_extracted else "."
if isCustomExport:
filepath = exportPath
# The custom .c references _WIDTH/_HEIGHT defines from its sibling .h, read that too.
root, ext = os.path.splitext(exportPath)
filepath = root + ".h" if ext == ".c" else exportPath
else:
filepath = os.path.join(
ootGetPath(exportPath, isCustomExport, f"{extracted}/assets/objects/", folderName, False, False),
Expand Down