From ab90824b9cc0cba4946fd208b71e92c7d080d1e8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 21 Apr 2026 09:44:23 +0900
Subject: [PATCH] wip

---
 packages/frontend/src/world/room/engine.ts  | 4 ++--
 packages/frontend/src/world/room/utility.ts | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/world/room/engine.ts b/packages/frontend/src/world/room/engine.ts
index 9454c364af..51773990ca 100644
--- a/packages/frontend/src/world/room/engine.ts
+++ b/packages/frontend/src/world/room/engine.ts
@@ -810,8 +810,8 @@ export class RoomEngine extends EventEmitter<RoomEngineEvents> {
 				merged.setParent(subRoot);
 				merged.name = 'preMerged';
 
-				// freezeするとbabylon 9.3.2以降、snapshot rendering + clustered lighting + selection outlineの組み合わせでなんかレンダリングがグリッチする
-				//merged.material.freeze();
+				merged.material.freeze();
+				// subMaterialまでfreezeするとbabylon 9.3.2以降、snapshot rendering + clustered lighting + selection outlineの組み合わせでなんかレンダリングがグリッチする
 				//if (merged.material instanceof BABYLON.MultiMaterial) {
 				//	for (const subMat of merged.material.subMaterials) {
 				//		subMat.freeze();
diff --git a/packages/frontend/src/world/room/utility.ts b/packages/frontend/src/world/room/utility.ts
index 02d8c57bad..ed483a9478 100644
--- a/packages/frontend/src/world/room/utility.ts
+++ b/packages/frontend/src/world/room/utility.ts
@@ -306,13 +306,15 @@ export class ModelManager {
 
 		const merged = BABYLON.Mesh.MergeMeshes(toMerge, true, false, undefined, false, true);
 		merged.parent = this.root;
-		// freezeするとbabylon 9.3.2以降、snapshot rendering + clustered lighting + selection outlineの組み合わせでなんかレンダリングがグリッチする
-		//merged.material.freeze();
+
+		merged.material.freeze();
+		// subMaterialまでfreezeするとbabylon 9.3.2以降、snapshot rendering + clustered lighting + selection outlineの組み合わせでなんかレンダリングがグリッチする
 		//if (merged.material instanceof BABYLON.MultiMaterial) {
 		//	for (const subMat of merged.material.subMaterials) {
 		//		(subMat as BABYLON.PBRMaterial).freeze();
 		//	}
 		//}
+
 		merged.freezeWorldMatrix();
 		merged.metadata = { ...this.root.metadata };
 		if (!this.hasTexture) merged.convertToUnIndexedMesh();