From ce425a4ba54c71c6ea01852e1fea80084d0665fe Mon Sep 17 00:00:00 2001 From: Anoliah <173389381+Anoliah@users.noreply.github.com> Date: Sat, 24 Jan 2026 09:13:58 -0800 Subject: [PATCH 1/2] fix final revert deduplication --- fast64_internal/f3d/f3d_gbi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast64_internal/f3d/f3d_gbi.py b/fast64_internal/f3d/f3d_gbi.py index 397ba84d4..4ccdd3177 100644 --- a/fast64_internal/f3d/f3d_gbi.py +++ b/fast64_internal/f3d/f3d_gbi.py @@ -2452,7 +2452,7 @@ def addMesh(self, name, namePrefix, drawLayer, isSkinned, contextObj, dedup=Fals if dedup: for i in range(1, len(self.meshes) + 2): if final_name in self.meshes: - final_name = f"{name}_{i:03}" + final_name = f"{final_name}_{i:03}" checkUniqueBoneNames(self, final_name, name) self.meshes[final_name] = mesh = FMesh(final_name, self.DLFormat) self.onAddMesh(mesh, contextObj) From 61ac4f78fb55713e403e8be58a0d34cbb6f4cf63 Mon Sep 17 00:00:00 2001 From: Anoliah <173389381+Anoliah@users.noreply.github.com> Date: Sat, 24 Jan 2026 09:39:09 -0800 Subject: [PATCH 2/2] use base name --- fast64_internal/f3d/f3d_gbi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fast64_internal/f3d/f3d_gbi.py b/fast64_internal/f3d/f3d_gbi.py index 4ccdd3177..19f7e0d9f 100644 --- a/fast64_internal/f3d/f3d_gbi.py +++ b/fast64_internal/f3d/f3d_gbi.py @@ -2450,9 +2450,10 @@ def addLight(self, key, value, fMaterial): def addMesh(self, name, namePrefix, drawLayer, isSkinned, contextObj, dedup=False): final_name = getFMeshName(name, namePrefix, drawLayer, isSkinned) if dedup: + base_name = final_name for i in range(1, len(self.meshes) + 2): if final_name in self.meshes: - final_name = f"{final_name}_{i:03}" + final_name = f"{base_name}_{i:03}" checkUniqueBoneNames(self, final_name, name) self.meshes[final_name] = mesh = FMesh(final_name, self.DLFormat) self.onAddMesh(mesh, contextObj)