From 614e8a7254f8564be43f4f9bb4924c3909331b86 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 5 Apr 2026 13:12:23 +0900
Subject: [PATCH] Update engine.ts

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

diff --git a/packages/frontend/src/utility/room/engine.ts b/packages/frontend/src/utility/room/engine.ts
index 312d8c724b..81065e6d1c 100644
--- a/packages/frontend/src/utility/room/engine.ts
+++ b/packages/frontend/src/utility/room/engine.ts
@@ -263,6 +263,7 @@ class ModelManager {
 			}
 		}
 		merged.freezeWorldMatrix();
+		merged.metadata = { ...this.root.metadata };
 		this.bakedMeshes = [merged];
 
 		this.bakedCallback?.([...this.bakedMeshes, ...excludeMeshes]);
@@ -1126,6 +1127,10 @@ export class RoomEngine {
 				const soMesh = this.objectEntities.get(soid)!.rootMesh;
 				setStickyParentRecursively(soMesh);
 				soMesh.setParent(mesh);
+				soMesh.unfreezeWorldMatrix();
+				for (const m of soMesh.getChildMeshes()) {
+					m.unfreezeWorldMatrix();
+				}
 			}
 		};
 		setStickyParentRecursively(selectedObject);