From 7a939dc5b37523167157b3de4a54095bb71b6bf1 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 2 Apr 2026 14:45:42 +0900
Subject: [PATCH] Update engine.ts

---
 packages/frontend/src/utility/room/engine.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts
index 177eeff1c6..291b47af5a 100644
--- a/packages/frontend/src/utility/room/engine.ts
+++ b/packages/frontend/src/utility/room/engine.ts
@@ -202,10 +202,12 @@ class ModelManager {
 			const _toMerge = [] as BABYLON.Mesh[];
 			for (const mesh of childMeshes) {
 				let fixedMesh = mesh;
+				fixedMesh.isVisible = false;
 
 				if (mesh instanceof BABYLON.InstancedMesh) {
 					const sourceMesh = mesh.sourceMesh;
 					const newMesh = sourceMesh.clone(mesh.name + '_baked');
+					sourceMesh.getScene().removeMesh(newMesh);
 
 					newMesh.position = mesh.position.clone();
 					if (mesh.rotationQuaternion) {
@@ -214,21 +216,19 @@ class ModelManager {
 						newMesh.rotation = mesh.rotation.clone();
 					}
 					newMesh.scaling = mesh.scaling.clone();
-
 					newMesh.parent = mesh.parent;
-
-					mesh.dispose();
+					newMesh.isVisible = false;
 
 					fixedMesh = newMesh;
 				}
 
-				fixedMesh.isVisible = false;
 				_toMerge.push(fixedMesh);
 			}
 
 			const toMerge = [] as BABYLON.Mesh[];
 			for (const mesh of _toMerge) {
 				const newMesh = mesh.clone(mesh.name + '_bakeMerged');
+				mesh.makeGeometryUnique();
 				applyMorphTargetsToMesh(newMesh);
 				//newMesh.bakeCurrentTransformIntoVertices();
 				toMerge.push(newMesh);